Skip to content

Commit b4f5446

Browse files
committed
update rails version
1 parent ea5ff36 commit b4f5446

File tree

2 files changed

+45
-46
lines changed

2 files changed

+45
-46
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '3.2.12'
3+
gem 'rails', '~> 3.2.22'
44

55
# Gems used only for assets and not required
66
# in production environments by default.

Gemfile.lock

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.12)
5-
actionpack (= 3.2.12)
6-
mail (~> 2.4.4)
7-
actionpack (3.2.12)
8-
activemodel (= 3.2.12)
9-
activesupport (= 3.2.12)
4+
actionmailer (3.2.22.4)
5+
actionpack (= 3.2.22.4)
6+
mail (~> 2.5.4)
7+
actionpack (3.2.22.4)
8+
activemodel (= 3.2.22.4)
9+
activesupport (= 3.2.22.4)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.4)
1313
rack (~> 1.4.5)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.2.1)
17-
activemodel (3.2.12)
18-
activesupport (= 3.2.12)
17+
activemodel (3.2.22.4)
18+
activesupport (= 3.2.22.4)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.12)
21-
activemodel (= 3.2.12)
22-
activesupport (= 3.2.12)
20+
activerecord (3.2.22.4)
21+
activemodel (= 3.2.22.4)
22+
activesupport (= 3.2.22.4)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.12)
26-
activemodel (= 3.2.12)
27-
activesupport (= 3.2.12)
28-
activesupport (3.2.12)
29-
i18n (~> 0.6)
25+
activeresource (3.2.22.4)
26+
activemodel (= 3.2.22.4)
27+
activesupport (= 3.2.22.4)
28+
activesupport (3.2.22.4)
29+
i18n (~> 0.6, >= 0.6.4)
3030
multi_json (~> 1.0)
3131
acts-as-taggable-on (2.3.3)
3232
rails (~> 3.0)
33-
arel (3.0.2)
33+
arel (3.0.3)
3434
axlsx (2.0.1)
3535
htmlentities (~> 4.3.1)
3636
nokogiri (>= 1.4.1)
@@ -86,27 +86,26 @@ GEM
8686
i18n (~> 0.4)
8787
gabba (1.0.1)
8888
highline (1.6.13)
89-
hike (1.2.2)
89+
hike (1.2.3)
9090
htmlentities (4.3.3)
91-
i18n (0.6.4)
91+
i18n (0.7.0)
9292
journey (1.0.4)
9393
jquery-rails (2.0.2)
9494
railties (>= 3.2.0, < 5.0)
9595
thor (~> 0.14)
96-
json (1.8.0)
96+
json (1.8.3)
9797
jsonify (0.3.1)
9898
multi_json (~> 1.0)
9999
jsonify-rails (0.3.2)
100100
actionpack
101101
jsonify (< 0.4.0)
102102
libv8 (3.3.10.4)
103-
mail (2.4.4)
104-
i18n (>= 0.4.0)
103+
mail (2.5.4)
105104
mime-types (~> 1.16)
106105
treetop (~> 1.4.8)
107-
mime-types (1.23)
106+
mime-types (1.25.1)
108107
mini_portile (0.6.2)
109-
multi_json (1.7.4)
108+
multi_json (1.12.1)
110109
mysql2 (0.3.11)
111110
mysql2 (0.3.11-x86-mingw32)
112111
net-scp (1.0.4)
@@ -131,35 +130,35 @@ GEM
131130
blankslate (~> 2.0)
132131
polyamorous (0.5.0)
133132
activerecord (~> 3.0)
134-
polyglot (0.3.3)
133+
polyglot (0.3.5)
135134
quiet_assets (1.0.1)
136135
railties (~> 3.1)
137-
rack (1.4.5)
138-
rack-cache (1.2)
136+
rack (1.4.7)
137+
rack-cache (1.6.1)
139138
rack (>= 0.4)
140-
rack-ssl (1.3.3)
139+
rack-ssl (1.3.4)
141140
rack
142141
rack-ssl-enforcer (0.2.4)
143-
rack-test (0.6.2)
142+
rack-test (0.6.3)
144143
rack (>= 1.0)
145-
rails (3.2.12)
146-
actionmailer (= 3.2.12)
147-
actionpack (= 3.2.12)
148-
activerecord (= 3.2.12)
149-
activeresource (= 3.2.12)
150-
activesupport (= 3.2.12)
144+
rails (3.2.22.4)
145+
actionmailer (= 3.2.22.4)
146+
actionpack (= 3.2.22.4)
147+
activerecord (= 3.2.22.4)
148+
activeresource (= 3.2.22.4)
149+
activesupport (= 3.2.22.4)
151150
bundler (~> 1.0)
152-
railties (= 3.2.12)
151+
railties (= 3.2.22.4)
153152
rails3-jquery-autocomplete (1.0.7)
154153
rails (~> 3.0)
155-
railties (3.2.12)
156-
actionpack (= 3.2.12)
157-
activesupport (= 3.2.12)
154+
railties (3.2.22.4)
155+
actionpack (= 3.2.22.4)
156+
activesupport (= 3.2.22.4)
158157
rack-ssl (~> 1.3.2)
159158
rake (>= 0.8.7)
160159
rdoc (~> 3.4)
161160
thor (>= 0.14.6, < 2.0)
162-
rake (10.0.4)
161+
rake (11.2.2)
163162
randumb (0.3.1)
164163
activerecord (>= 3.0.0)
165164
activesupport (>= 3.0.0)
@@ -175,7 +174,7 @@ GEM
175174
railties (~> 3.2.0)
176175
sass (>= 3.1.10)
177176
tilt (~> 1.3)
178-
sprockets (2.2.2)
177+
sprockets (2.2.3)
179178
hike (~> 1.2)
180179
multi_json (~> 1.0)
181180
rack (~> 1.0)
@@ -193,13 +192,13 @@ GEM
193192
daemons (>= 1.0.9)
194193
eventmachine (>= 0.12.6)
195194
rack (>= 1.0.0)
196-
thor (0.18.1)
195+
thor (0.19.1)
197196
tilt (1.4.1)
198197
timecop (0.3.5)
199-
treetop (1.4.12)
198+
treetop (1.4.15)
200199
polyglot
201200
polyglot (>= 0.3.1)
202-
tzinfo (0.3.37)
201+
tzinfo (0.3.51)
203202
uglifier (1.2.6)
204203
execjs (>= 0.3.0)
205204
multi_json (~> 1.3)
@@ -236,7 +235,7 @@ DEPENDENCIES
236235
parslet (~> 1.4.0)
237236
quiet_assets (~> 1.0.1)
238237
rack-ssl-enforcer (~> 0.2.4)
239-
rails (= 3.2.12)
238+
rails (~> 3.2.22)
240239
rails3-jquery-autocomplete (~> 1.0.7)
241240
randumb (~> 0.3.1)
242241
recaptcha (~> 0.3.4)

0 commit comments

Comments
 (0)