Skip to content

Commit 653fb6b

Browse files
authored
Merge pull request saasbook#17 from saasbook/ruby_2_4
upgrade to ruby 2.4 and rails 4.2.10
2 parents d84672d + 3eaf375 commit 653fb6b

File tree

2 files changed

+76
-64
lines changed

2 files changed

+76
-64
lines changed

‎rottenpotatoes/Gemfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

3-
ruby '2.3.0'
4-
gem 'rails', '4.2.6'
3+
ruby '2.4.0'
4+
gem 'rails', '4.2.10'
55
# Bundle edge Rails instead:
66
# gem 'rails', :git => 'git://github.com/rails/rails.git'
77

@@ -13,6 +13,8 @@ group :development, :test do
1313
gem 'capybara'
1414
gem 'launchy'
1515
gem 'rspec-rails'
16+
gem 'pry'
17+
gem 'pry-byebug'
1618
end
1719

1820
group :test do

‎rottenpotatoes/Gemfile.lock‎

Lines changed: 72 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.6)
5-
actionpack (= 4.2.6)
6-
actionview (= 4.2.6)
7-
activejob (= 4.2.6)
4+
actionmailer (4.2.10)
5+
actionpack (= 4.2.10)
6+
actionview (= 4.2.10)
7+
activejob (= 4.2.10)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.6)
11-
actionview (= 4.2.6)
12-
activesupport (= 4.2.6)
10+
actionpack (4.2.10)
11+
actionview (= 4.2.10)
12+
activesupport (= 4.2.10)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.6)
18-
activesupport (= 4.2.6)
17+
actionview (4.2.10)
18+
activesupport (= 4.2.10)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
22-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
activejob (4.2.6)
24-
activesupport (= 4.2.6)
22+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
23+
activejob (4.2.10)
24+
activesupport (= 4.2.10)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.6)
27-
activesupport (= 4.2.6)
26+
activemodel (4.2.10)
27+
activesupport (= 4.2.10)
2828
builder (~> 3.1)
29-
activerecord (4.2.6)
30-
activemodel (= 4.2.6)
31-
activesupport (= 4.2.6)
29+
activerecord (4.2.10)
30+
activemodel (= 4.2.10)
31+
activesupport (= 4.2.10)
3232
arel (~> 6.0)
33-
activesupport (4.2.6)
33+
activesupport (4.2.10)
3434
i18n (~> 0.7)
35-
json (~> 1.7, >= 1.7.7)
3635
minitest (~> 5.1)
3736
thread_safe (~> 0.3, >= 0.3.4)
3837
tzinfo (~> 1.1)
3938
addressable (2.4.0)
40-
arel (6.0.3)
41-
builder (3.2.2)
39+
arel (6.0.4)
40+
builder (3.2.3)
4241
byebug (9.0.5)
4342
capybara (2.7.1)
4443
addressable
@@ -47,14 +46,16 @@ GEM
4746
rack (>= 1.0.0)
4847
rack-test (>= 0.5.4)
4948
xpath (~> 2.0)
49+
coderay (1.1.2)
5050
coffee-rails (4.1.1)
5151
coffee-script (>= 2.2.0)
5252
railties (>= 4.0.0, < 5.1.x)
5353
coffee-script (2.4.1)
5454
coffee-script-source
5555
execjs
5656
coffee-script-source (1.10.0)
57-
concurrent-ruby (1.0.2)
57+
concurrent-ruby (1.0.5)
58+
crass (1.0.4)
5859
cucumber (2.4.0)
5960
builder (>= 2.1.2)
6061
cucumber-core (~> 1.5.0)
@@ -79,63 +80,70 @@ GEM
7980
erubis (2.7.0)
8081
execjs (2.7.0)
8182
gherkin (4.0.0)
82-
globalid (0.3.6)
83-
activesupport (>= 4.1.0)
83+
globalid (0.4.1)
84+
activesupport (>= 4.2.0)
8485
haml (4.0.7)
8586
tilt
86-
i18n (0.7.0)
87+
i18n (0.9.5)
88+
concurrent-ruby (~> 1.0)
8789
jquery-rails (4.1.1)
8890
rails-dom-testing (>= 1, < 3)
8991
railties (>= 4.2.0)
9092
thor (>= 0.14, < 2.0)
91-
json (1.8.3)
9293
launchy (2.4.3)
9394
addressable (~> 2.3)
94-
loofah (2.0.3)
95+
loofah (2.2.2)
96+
crass (~> 1.0.2)
9597
nokogiri (>= 1.5.9)
96-
mail (2.6.4)
97-
mime-types (>= 1.16, < 4)
98+
mail (2.7.0)
99+
mini_mime (>= 0.1.1)
100+
method_source (0.9.0)
98101
mime-types (3.1)
99102
mime-types-data (~> 3.2015)
100103
mime-types-data (3.2016.0521)
101-
mini_portile2 (2.1.0)
102-
minitest (5.9.0)
104+
mini_mime (1.0.0)
105+
mini_portile2 (2.3.0)
106+
minitest (5.11.3)
103107
multi_json (1.12.1)
104108
multi_test (0.1.2)
105-
nokogiri (1.6.8)
106-
mini_portile2 (~> 2.1.0)
107-
pkg-config (~> 1.1.7)
108-
pkg-config (1.1.7)
109+
nokogiri (1.8.3)
110+
mini_portile2 (~> 2.3.0)
109111
protected_attributes (1.1.3)
110112
activemodel (>= 4.0.1, < 5.0)
111-
rack (1.6.4)
113+
pry (0.11.3)
114+
coderay (~> 1.1.0)
115+
method_source (~> 0.9.0)
116+
pry-byebug (3.4.3)
117+
byebug (>= 9.0, < 9.1)
118+
pry (~> 0.10)
119+
rack (1.6.10)
112120
rack-test (0.6.3)
113121
rack (>= 1.0)
114-
rails (4.2.6)
115-
actionmailer (= 4.2.6)
116-
actionpack (= 4.2.6)
117-
actionview (= 4.2.6)
118-
activejob (= 4.2.6)
119-
activemodel (= 4.2.6)
120-
activerecord (= 4.2.6)
121-
activesupport (= 4.2.6)
122+
rails (4.2.10)
123+
actionmailer (= 4.2.10)
124+
actionpack (= 4.2.10)
125+
actionview (= 4.2.10)
126+
activejob (= 4.2.10)
127+
activemodel (= 4.2.10)
128+
activerecord (= 4.2.10)
129+
activesupport (= 4.2.10)
122130
bundler (>= 1.3.0, < 2.0)
123-
railties (= 4.2.6)
131+
railties (= 4.2.10)
124132
sprockets-rails
125133
rails-deprecated_sanitizer (1.0.3)
126134
activesupport (>= 4.2.0.alpha)
127-
rails-dom-testing (1.0.7)
128-
activesupport (>= 4.2.0.beta, < 5.0)
129-
nokogiri (~> 1.6.0)
135+
rails-dom-testing (1.0.9)
136+
activesupport (>= 4.2.0, < 5.0)
137+
nokogiri (~> 1.6)
130138
rails-deprecated_sanitizer (>= 1.0.1)
131-
rails-html-sanitizer (1.0.3)
132-
loofah (~> 2.0)
133-
railties (4.2.6)
134-
actionpack (= 4.2.6)
135-
activesupport (= 4.2.6)
139+
rails-html-sanitizer (1.0.4)
140+
loofah (~> 2.2, >= 2.2.2)
141+
railties (4.2.10)
142+
actionpack (= 4.2.10)
143+
activesupport (= 4.2.10)
136144
rake (>= 0.8.7)
137145
thor (>= 0.18.1, < 2.0)
138-
rake (11.2.2)
146+
rake (12.3.1)
139147
rspec-core (3.4.4)
140148
rspec-support (~> 3.4.0)
141149
rspec-expectations (3.4.0)
@@ -160,18 +168,18 @@ GEM
160168
sprockets (>= 2.8, < 4.0)
161169
sprockets-rails (>= 2.0, < 4.0)
162170
tilt (>= 1.1, < 3)
163-
sprockets (3.6.2)
171+
sprockets (3.7.2)
164172
concurrent-ruby (~> 1.0)
165173
rack (> 1, < 3)
166-
sprockets-rails (3.1.1)
174+
sprockets-rails (3.2.1)
167175
actionpack (>= 4.0)
168176
activesupport (>= 4.0)
169177
sprockets (>= 3.0.0)
170178
sqlite3 (1.3.11)
171-
thor (0.19.1)
172-
thread_safe (0.3.5)
179+
thor (0.20.0)
180+
thread_safe (0.3.6)
173181
tilt (2.0.5)
174-
tzinfo (1.2.2)
182+
tzinfo (1.2.5)
175183
thread_safe (~> 0.1)
176184
uglifier (3.0.0)
177185
execjs (>= 0.3.0, < 3)
@@ -192,14 +200,16 @@ DEPENDENCIES
192200
jquery-rails
193201
launchy
194202
protected_attributes
195-
rails (= 4.2.6)
203+
pry
204+
pry-byebug
205+
rails (= 4.2.10)
196206
rspec-rails
197207
sass-rails (~> 5.0.3)
198208
sqlite3
199209
uglifier (>= 2.7.1)
200210

201211
RUBY VERSION
202-
ruby 2.3.0p0
212+
ruby 2.4.0p0
203213

204214
BUNDLED WITH
205-
1.12.4
215+
1.16.1

0 commit comments

Comments
 (0)