Skip to content

Commit 9220ede

Browse files
committed
Update to latest Rails
1 parent 930ba2a commit 9220ede

2 files changed

Lines changed: 75 additions & 46 deletions

File tree

Gemfile

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

3-
gem 'rails', '~> 4.0.0'
3+
gem 'rails', '~> 4.2.0'
44
gem 'sass-rails'
55
gem 'coffee-rails'
66
gem 'uglifier'

Gemfile.lock

Lines changed: 73 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,52 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
44
ZenTest (4.11.0)
5-
actionmailer (4.0.13)
6-
actionpack (= 4.0.13)
5+
actionmailer (4.2.4)
6+
actionpack (= 4.2.4)
7+
actionview (= 4.2.4)
8+
activejob (= 4.2.4)
79
mail (~> 2.5, >= 2.5.4)
8-
actionpack (4.0.13)
9-
activesupport (= 4.0.13)
10-
builder (~> 3.1.0)
11-
erubis (~> 2.7.0)
12-
rack (~> 1.5.2)
10+
rails-dom-testing (~> 1.0, >= 1.0.5)
11+
actionpack (4.2.4)
12+
actionview (= 4.2.4)
13+
activesupport (= 4.2.4)
14+
rack (~> 1.6)
1315
rack-test (~> 0.6.2)
14-
activemodel (4.0.13)
15-
activesupport (= 4.0.13)
16-
builder (~> 3.1.0)
17-
activerecord (4.0.13)
18-
activemodel (= 4.0.13)
19-
activerecord-deprecated_finders (~> 1.0.2)
20-
activesupport (= 4.0.13)
21-
arel (~> 4.0.0)
22-
activerecord-deprecated_finders (1.0.4)
23-
activesupport (4.0.13)
24-
i18n (~> 0.6, >= 0.6.9)
25-
minitest (~> 4.2)
26-
multi_json (~> 1.3)
27-
thread_safe (~> 0.1)
28-
tzinfo (~> 0.3.37)
16+
rails-dom-testing (~> 1.0, >= 1.0.5)
17+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
18+
actionview (4.2.4)
19+
activesupport (= 4.2.4)
20+
builder (~> 3.1)
21+
erubis (~> 2.7.0)
22+
rails-dom-testing (~> 1.0, >= 1.0.5)
23+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
24+
activejob (4.2.4)
25+
activesupport (= 4.2.4)
26+
globalid (>= 0.3.0)
27+
activemodel (4.2.4)
28+
activesupport (= 4.2.4)
29+
builder (~> 3.1)
30+
activerecord (4.2.4)
31+
activemodel (= 4.2.4)
32+
activesupport (= 4.2.4)
33+
arel (~> 6.0)
34+
activesupport (4.2.4)
35+
i18n (~> 0.7)
36+
json (~> 1.7, >= 1.7.7)
37+
minitest (~> 5.1)
38+
thread_safe (~> 0.3, >= 0.3.4)
39+
tzinfo (~> 1.1)
2940
ansi (1.5.0)
30-
arel (4.0.2)
41+
arel (6.0.3)
3142
autotest (4.4.6)
3243
ZenTest (>= 4.4.1)
3344
autotest-inotify (0.0.6)
3445
autotest (>= 4.2.4)
3546
rb-inotify
3647
autotest-rails-pure (4.1.2)
3748
autotest-standalone (4.5.11)
38-
builder (3.1.4)
49+
builder (3.2.2)
3950
capistrano (3.4.0)
4051
i18n
4152
rake (>= 10.0.0)
@@ -53,39 +64,57 @@ GEM
5364
execjs (2.6.0)
5465
ffi (1.9.10)
5566
geocoder (1.2.11)
67+
globalid (0.3.6)
68+
activesupport (>= 4.1.0)
5669
gmaps4rails (2.1.2)
5770
http_accept_language (2.0.5)
5871
i18n (0.7.0)
59-
jquery-rails (3.1.4)
60-
railties (>= 3.0, < 5.0)
72+
jquery-rails (4.0.5)
73+
rails-dom-testing (~> 1.0)
74+
railties (>= 4.2.0)
6175
thor (>= 0.14, < 2.0)
6276
json (1.8.3)
6377
libv8 (3.16.14.11)
6478
lodash-rails (3.10.1)
6579
railties (>= 3.1)
80+
loofah (2.0.3)
81+
nokogiri (>= 1.5.9)
6682
mail (2.6.3)
6783
mime-types (>= 1.16, < 3)
6884
mime-types (2.6.2)
69-
minitest (4.7.5)
70-
multi_json (1.11.2)
85+
mini_portile (0.6.2)
86+
minitest (5.8.1)
7187
net-scp (1.2.1)
7288
net-ssh (>= 2.6.5)
7389
net-ssh (3.0.1)
90+
nokogiri (1.6.6.2)
91+
mini_portile (~> 0.6.0)
7492
power_assert (0.2.4)
75-
rack (1.5.5)
93+
rack (1.6.4)
7694
rack-test (0.6.3)
7795
rack (>= 1.0)
78-
rails (4.0.13)
79-
actionmailer (= 4.0.13)
80-
actionpack (= 4.0.13)
81-
activerecord (= 4.0.13)
82-
activesupport (= 4.0.13)
96+
rails (4.2.4)
97+
actionmailer (= 4.2.4)
98+
actionpack (= 4.2.4)
99+
actionview (= 4.2.4)
100+
activejob (= 4.2.4)
101+
activemodel (= 4.2.4)
102+
activerecord (= 4.2.4)
103+
activesupport (= 4.2.4)
83104
bundler (>= 1.3.0, < 2.0)
84-
railties (= 4.0.13)
85-
sprockets-rails (~> 2.0)
86-
railties (4.0.13)
87-
actionpack (= 4.0.13)
88-
activesupport (= 4.0.13)
105+
railties (= 4.2.4)
106+
sprockets-rails
107+
rails-deprecated_sanitizer (1.0.3)
108+
activesupport (>= 4.2.0.alpha)
109+
rails-dom-testing (1.0.7)
110+
activesupport (>= 4.2.0.beta, < 5.0)
111+
nokogiri (~> 1.6.0)
112+
rails-deprecated_sanitizer (>= 1.0.1)
113+
rails-html-sanitizer (1.0.2)
114+
loofah (~> 2.0)
115+
railties (4.2.4)
116+
actionpack (= 4.2.4)
117+
activesupport (= 4.2.4)
89118
rake (>= 0.8.7)
90119
thor (>= 0.18.1, < 2.0)
91120
rake (10.4.2)
@@ -139,10 +168,10 @@ GEM
139168
thor (0.19.1)
140169
thread_safe (0.3.5)
141170
tilt (2.0.1)
142-
turn (0.9.7)
171+
turn (0.9.6)
143172
ansi
144-
minitest (~> 4)
145-
tzinfo (0.3.45)
173+
tzinfo (1.2.2)
174+
thread_safe (~> 0.1)
146175
uglifier (2.7.2)
147176
execjs (>= 0.3.0)
148177
json (>= 1.8.0)
@@ -161,7 +190,7 @@ DEPENDENCIES
161190
http_accept_language
162191
jquery-rails
163192
lodash-rails
164-
rails (~> 4.0.0)
193+
rails (~> 4.2.0)
165194
rspec-rails
166195
rvm
167196
sass-rails

0 commit comments

Comments
 (0)