Download as
Browse Code »

Commit 0c9d116f9271d90f611946b47c753b95364e18f0

Authored by Sergey Nartimov
2 parents a036b6d2 6c220a98
Exists in master and in 1 other branch production

Merge pull request #400 from rdlugosz/update_rails_to_3-2-12 

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