Download as
Browse Code »

Commit 06d9ccf4843cb016855499c169a7238c1c271ee2

Authored by Dmitriy Zaporozhets
1 parent 68aa88c9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Rails up to 3.2.12

Showing 2 changed files with 34 additions and 34 deletions   Show diff stats
@@ -8,7 +8,7 @@ def linux_only(require_as) @@ -8,7 +8,7 @@ def linux_only(require_as)
8 RUBY_PLATFORM.include?('linux') && require_as 8 RUBY_PLATFORM.include?('linux') && require_as
9 end 9 end
10 10
11 -gem "rails", "3.2.11" 11 +gem "rails", "3.2.12"
12 12
13 # Supported DBs 13 # Supported DBs
14 gem "mysql2", group: :mysql 14 gem "mysql2", group: :mysql
@@ -69,31 +69,31 @@ GIT @@ -69,31 +69,31 @@ GIT
69 GEM 69 GEM
70 remote: http://rubygems.org/ 70 remote: http://rubygems.org/
71 specs: 71 specs:
72 - actionmailer (3.2.11)  
73 - actionpack (= 3.2.11) 72 + actionmailer (3.2.12)
  73 + actionpack (= 3.2.12)
74 mail (~> 2.4.4) 74 mail (~> 2.4.4)
75 - actionpack (3.2.11)  
76 - activemodel (= 3.2.11)  
77 - activesupport (= 3.2.11) 75 + actionpack (3.2.12)
  76 + activemodel (= 3.2.12)
  77 + activesupport (= 3.2.12)
78 builder (~> 3.0.0) 78 builder (~> 3.0.0)
79 erubis (~> 2.7.0) 79 erubis (~> 2.7.0)
80 journey (~> 1.0.4) 80 journey (~> 1.0.4)
81 - rack (~> 1.4.0) 81 + rack (~> 1.4.5)
82 rack-cache (~> 1.2) 82 rack-cache (~> 1.2)
83 rack-test (~> 0.6.1) 83 rack-test (~> 0.6.1)
84 sprockets (~> 2.2.1) 84 sprockets (~> 2.2.1)
85 - activemodel (3.2.11)  
86 - activesupport (= 3.2.11) 85 + activemodel (3.2.12)
  86 + activesupport (= 3.2.12)
87 builder (~> 3.0.0) 87 builder (~> 3.0.0)
88 - activerecord (3.2.11)  
89 - activemodel (= 3.2.11)  
90 - activesupport (= 3.2.11) 88 + activerecord (3.2.12)
  89 + activemodel (= 3.2.12)
  90 + activesupport (= 3.2.12)
91 arel (~> 3.0.2) 91 arel (~> 3.0.2)
92 tzinfo (~> 0.3.29) 92 tzinfo (~> 0.3.29)
93 - activeresource (3.2.11)  
94 - activemodel (= 3.2.11)  
95 - activesupport (= 3.2.11)  
96 - activesupport (3.2.11) 93 + activeresource (3.2.12)
  94 + activemodel (= 3.2.12)
  95 + activesupport (= 3.2.12)
  96 + activesupport (3.2.12)
97 i18n (~> 0.6) 97 i18n (~> 0.6)
98 multi_json (~> 1.0) 98 multi_json (~> 1.0)
99 acts-as-taggable-on (2.3.3) 99 acts-as-taggable-on (2.3.3)
@@ -237,7 +237,7 @@ GEM @@ -237,7 +237,7 @@ GEM
237 jquery-ui-rails (2.0.2) 237 jquery-ui-rails (2.0.2)
238 jquery-rails 238 jquery-rails
239 railties (>= 3.1.0) 239 railties (>= 3.1.0)
240 - json (1.7.6) 240 + json (1.7.7)
241 jwt (0.1.5) 241 jwt (0.1.5)
242 multi_json (>= 1.0) 242 multi_json (>= 1.0)
243 kaminari (0.14.1) 243 kaminari (0.14.1)
@@ -258,10 +258,10 @@ GEM @@ -258,10 +258,10 @@ GEM
258 mime-types (~> 1.16) 258 mime-types (~> 1.16)
259 treetop (~> 1.4.8) 259 treetop (~> 1.4.8)
260 method_source (0.8.1) 260 method_source (0.8.1)
261 - mime-types (1.19) 261 + mime-types (1.21)
262 modernizr (2.6.2) 262 modernizr (2.6.2)
263 sprockets (~> 2.0) 263 sprockets (~> 2.0)
264 - multi_json (1.5.0) 264 + multi_json (1.5.1)
265 multi_xml (0.5.1) 265 multi_xml (0.5.1)
266 multipart-post (1.1.5) 266 multipart-post (1.1.5)
267 mysql2 (0.3.11) 267 mysql2 (0.3.11)
@@ -304,7 +304,7 @@ GEM @@ -304,7 +304,7 @@ GEM
304 pyu-ruby-sasl (0.0.3.3) 304 pyu-ruby-sasl (0.0.3.3)
305 quiet_assets (1.0.1) 305 quiet_assets (1.0.1)
306 railties (~> 3.1) 306 railties (~> 3.1)
307 - rack (1.4.3) 307 + rack (1.4.5)
308 rack-accept (0.4.5) 308 rack-accept (0.4.5)
309 rack (>= 0.4) 309 rack (>= 0.4)
310 rack-cache (1.2) 310 rack-cache (1.2)
@@ -315,18 +315,18 @@ GEM @@ -315,18 +315,18 @@ GEM
315 rack (>= 1.0.0) 315 rack (>= 1.0.0)
316 rack-protection (1.3.2) 316 rack-protection (1.3.2)
317 rack 317 rack
318 - rack-ssl (1.3.2) 318 + rack-ssl (1.3.3)
319 rack 319 rack
320 rack-test (0.6.2) 320 rack-test (0.6.2)
321 rack (>= 1.0) 321 rack (>= 1.0)
322 - rails (3.2.11)  
323 - actionmailer (= 3.2.11)  
324 - actionpack (= 3.2.11)  
325 - activerecord (= 3.2.11)  
326 - activeresource (= 3.2.11)  
327 - activesupport (= 3.2.11) 322 + rails (3.2.12)
  323 + actionmailer (= 3.2.12)
  324 + actionpack (= 3.2.12)
  325 + activerecord (= 3.2.12)
  326 + activeresource (= 3.2.12)
  327 + activesupport (= 3.2.12)
328 bundler (~> 1.0) 328 bundler (~> 1.0)
329 - railties (= 3.2.11) 329 + railties (= 3.2.12)
330 rails-dev-tweaks (0.6.1) 330 rails-dev-tweaks (0.6.1)
331 actionpack (~> 3.1) 331 actionpack (~> 3.1)
332 railties (~> 3.1) 332 railties (~> 3.1)
@@ -338,9 +338,9 @@ GEM @@ -338,9 +338,9 @@ GEM
338 erubis 338 erubis
339 i18n 339 i18n
340 progressbar 340 progressbar
341 - railties (3.2.11)  
342 - actionpack (= 3.2.11)  
343 - activesupport (= 3.2.11) 341 + railties (3.2.12)
  342 + actionpack (= 3.2.12)
  343 + activesupport (= 3.2.12)
344 rack-ssl (~> 1.3.2) 344 rack-ssl (~> 1.3.2)
345 rake (>= 0.8.7) 345 rake (>= 0.8.7)
346 rdoc (~> 3.4) 346 rdoc (~> 3.4)
@@ -350,7 +350,7 @@ GEM @@ -350,7 +350,7 @@ GEM
350 rb-fsevent (0.9.2) 350 rb-fsevent (0.9.2)
351 rb-inotify (0.8.8) 351 rb-inotify (0.8.8)
352 ffi (>= 0.5.0) 352 ffi (>= 0.5.0)
353 - rdoc (3.12) 353 + rdoc (3.12.1)
354 json (~> 1.4) 354 json (~> 1.4)
355 redcarpet (2.2.2) 355 redcarpet (2.2.2)
356 redis (3.0.2) 356 redis (3.0.2)
@@ -433,7 +433,7 @@ GEM @@ -433,7 +433,7 @@ GEM
433 daemons (>= 1.0.9) 433 daemons (>= 1.0.9)
434 eventmachine (>= 0.12.6) 434 eventmachine (>= 0.12.6)
435 rack (>= 1.0.0) 435 rack (>= 1.0.0)
436 - thor (0.16.0) 436 + thor (0.17.0)
437 tilt (1.3.3) 437 tilt (1.3.3)
438 timers (1.0.2) 438 timers (1.0.2)
439 treetop (1.4.12) 439 treetop (1.4.12)
@@ -516,7 +516,7 @@ DEPENDENCIES @@ -516,7 +516,7 @@ DEPENDENCIES
516 pygments.rb! 516 pygments.rb!
517 quiet_assets (~> 1.0.1) 517 quiet_assets (~> 1.0.1)
518 rack-mini-profiler 518 rack-mini-profiler
519 - rails (= 3.2.11) 519 + rails (= 3.2.12)
520 rails-dev-tweaks 520 rails-dev-tweaks
521 rails_best_practices 521 rails_best_practices
522 raphael-rails! 522 raphael-rails!