Commit 6c220a9895919caff5a8e125295aaf30dc73b2f3
1 parent
a036b6d2
Exists in
master
and in
1 other branch
Update to Rails v 3.2.12
Showing
2 changed files
with
33 additions
and
33 deletions
Show diff stats
Gemfile
Gemfile.lock
... | ... | @@ -9,35 +9,35 @@ GEM |
9 | 9 | remote: http://rubygems.org/ |
10 | 10 | specs: |
11 | 11 | SystemTimer (1.2.3) |
12 | - actionmailer (3.2.11) | |
13 | - actionpack (= 3.2.11) | |
12 | + actionmailer (3.2.12) | |
13 | + actionpack (= 3.2.12) | |
14 | 14 | mail (~> 2.4.4) |
15 | 15 | actionmailer_inline_css (1.3.1) |
16 | 16 | actionmailer (>= 3.0.0) |
17 | 17 | nokogiri (>= 1.4.4) |
18 | 18 | premailer (>= 1.7.1) |
19 | - actionpack (3.2.11) | |
20 | - activemodel (= 3.2.11) | |
21 | - activesupport (= 3.2.11) | |
19 | + actionpack (3.2.12) | |
20 | + activemodel (= 3.2.12) | |
21 | + activesupport (= 3.2.12) | |
22 | 22 | builder (~> 3.0.0) |
23 | 23 | erubis (~> 2.7.0) |
24 | 24 | journey (~> 1.0.4) |
25 | - rack (~> 1.4.0) | |
25 | + rack (~> 1.4.5) | |
26 | 26 | rack-cache (~> 1.2) |
27 | 27 | rack-test (~> 0.6.1) |
28 | 28 | sprockets (~> 2.2.1) |
29 | - activemodel (3.2.11) | |
30 | - activesupport (= 3.2.11) | |
29 | + activemodel (3.2.12) | |
30 | + activesupport (= 3.2.12) | |
31 | 31 | builder (~> 3.0.0) |
32 | - activerecord (3.2.11) | |
33 | - activemodel (= 3.2.11) | |
34 | - activesupport (= 3.2.11) | |
32 | + activerecord (3.2.12) | |
33 | + activemodel (= 3.2.12) | |
34 | + activesupport (= 3.2.12) | |
35 | 35 | arel (~> 3.0.2) |
36 | 36 | tzinfo (~> 0.3.29) |
37 | - activeresource (3.2.11) | |
38 | - activemodel (= 3.2.11) | |
39 | - activesupport (= 3.2.11) | |
40 | - activesupport (3.2.11) | |
37 | + activeresource (3.2.12) | |
38 | + activemodel (= 3.2.12) | |
39 | + activesupport (= 3.2.12) | |
40 | + activesupport (3.2.12) | |
41 | 41 | i18n (~> 0.6) |
42 | 42 | multi_json (~> 1.0) |
43 | 43 | addressable (2.3.2) |
... | ... | @@ -131,7 +131,7 @@ GEM |
131 | 131 | has_scope (~> 0.5.0) |
132 | 132 | responders (~> 0.6) |
133 | 133 | journey (1.0.4) |
134 | - json (1.7.6) | |
134 | + json (1.7.7) | |
135 | 135 | jwt (0.1.5) |
136 | 136 | multi_json (>= 1.0) |
137 | 137 | kaminari (0.14.1) |
... | ... | @@ -154,7 +154,7 @@ GEM |
154 | 154 | mime-types (~> 1.16) |
155 | 155 | treetop (~> 1.4.8) |
156 | 156 | method_source (0.7.1) |
157 | - mime-types (1.19) | |
157 | + mime-types (1.21) | |
158 | 158 | mongo (1.6.2) |
159 | 159 | bson (~> 1.6.2) |
160 | 160 | mongoid (2.4.10) |
... | ... | @@ -166,7 +166,7 @@ GEM |
166 | 166 | bundler (>= 1.0.0) |
167 | 167 | rails (>= 3.0.0) |
168 | 168 | railties (>= 3.0.0) |
169 | - multi_json (1.5.0) | |
169 | + multi_json (1.5.1) | |
170 | 170 | multi_xml (0.5.2) |
171 | 171 | multipart-post (1.1.5) |
172 | 172 | net-scp (1.0.4) |
... | ... | @@ -223,24 +223,24 @@ GEM |
223 | 223 | rack (1.4.5) |
224 | 224 | rack-cache (1.2) |
225 | 225 | rack (>= 0.4) |
226 | - rack-ssl (1.3.2) | |
226 | + rack-ssl (1.3.3) | |
227 | 227 | rack |
228 | 228 | rack-ssl-enforcer (0.2.4) |
229 | 229 | rack-test (0.6.2) |
230 | 230 | rack (>= 1.0) |
231 | - rails (3.2.11) | |
232 | - actionmailer (= 3.2.11) | |
233 | - actionpack (= 3.2.11) | |
234 | - activerecord (= 3.2.11) | |
235 | - activeresource (= 3.2.11) | |
236 | - activesupport (= 3.2.11) | |
231 | + rails (3.2.12) | |
232 | + actionmailer (= 3.2.12) | |
233 | + actionpack (= 3.2.12) | |
234 | + activerecord (= 3.2.12) | |
235 | + activeresource (= 3.2.12) | |
236 | + activesupport (= 3.2.12) | |
237 | 237 | bundler (~> 1.0) |
238 | - railties (= 3.2.11) | |
238 | + railties (= 3.2.12) | |
239 | 239 | rails_autolink (1.0.9) |
240 | 240 | rails (~> 3.1) |
241 | - railties (3.2.11) | |
242 | - actionpack (= 3.2.11) | |
243 | - activesupport (= 3.2.11) | |
241 | + railties (3.2.12) | |
242 | + actionpack (= 3.2.12) | |
243 | + activesupport (= 3.2.12) | |
244 | 244 | rack-ssl (~> 1.3.2) |
245 | 245 | rake (>= 0.8.7) |
246 | 246 | rdoc (~> 3.4) |
... | ... | @@ -248,7 +248,7 @@ GEM |
248 | 248 | raindrops (0.10.0) |
249 | 249 | rake (10.0.3) |
250 | 250 | rbx-require-relative (0.0.9) |
251 | - rdoc (3.12) | |
251 | + rdoc (3.12.1) | |
252 | 252 | json (~> 1.4) |
253 | 253 | responders (0.9.2) |
254 | 254 | railties (~> 3.1) |
... | ... | @@ -297,7 +297,7 @@ GEM |
297 | 297 | daemons (>= 1.0.9) |
298 | 298 | eventmachine (>= 0.12.6) |
299 | 299 | rack (>= 1.0.0) |
300 | - thor (0.16.0) | |
300 | + thor (0.17.0) | |
301 | 301 | tilt (1.3.3) |
302 | 302 | timecop (0.3.5) |
303 | 303 | treetop (1.4.12) |
... | ... | @@ -366,7 +366,7 @@ DEPENDENCIES |
366 | 366 | pry-rails |
367 | 367 | rack-ssl |
368 | 368 | rack-ssl-enforcer |
369 | - rails (= 3.2.11) | |
369 | + rails (= 3.2.12) | |
370 | 370 | rails_autolink (~> 1.0.9) |
371 | 371 | ri_cal |
372 | 372 | rspec-rails (~> 2.6) | ... | ... |