Download as
Browse Code »

Commit cddec75dc1e309483aa80ea4533ff972507686ef

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

Update rails to 3.2.15

Showing 2 changed files with 32 additions and 32 deletions   Show diff stats
Gemfile
  Diff comments   View file @cddec75
... ... @@ -8,7 +8,7 @@ def linux_only(require_as)
8 8 RUBY_PLATFORM.include?('linux') && require_as
9 9 end
10 10  
11   -gem "rails", "3.2.13"
  11 +gem "rails", "3.2.15"
12 12  
13 13 # Supported DBs
14 14 gem "mysql2", group: :mysql
... ...
Gemfile.lock
  Diff comments   View file @cddec75
1 1 GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4   - actionmailer (3.2.13)
5   - actionpack (= 3.2.13)
6   - mail (~> 2.5.3)
7   - actionpack (3.2.13)
8   - activemodel (= 3.2.13)
9   - activesupport (= 3.2.13)
  4 + actionmailer (3.2.15)
  5 + actionpack (= 3.2.15)
  6 + mail (~> 2.5.4)
  7 + actionpack (3.2.15)
  8 + activemodel (= 3.2.15)
  9 + activesupport (= 3.2.15)
10 10 builder (~> 3.0.0)
11 11 erubis (~> 2.7.0)
12 12 journey (~> 1.0.4)
... ... @@ -14,19 +14,19 @@ GEM
14 14 rack-cache (~> 1.2)
15 15 rack-test (~> 0.6.1)
16 16 sprockets (~> 2.2.1)
17   - activemodel (3.2.13)
18   - activesupport (= 3.2.13)
  17 + activemodel (3.2.15)
  18 + activesupport (= 3.2.15)
19 19 builder (~> 3.0.0)
20   - activerecord (3.2.13)
21   - activemodel (= 3.2.13)
22   - activesupport (= 3.2.13)
  20 + activerecord (3.2.15)
  21 + activemodel (= 3.2.15)
  22 + activesupport (= 3.2.15)
23 23 arel (~> 3.0.2)
24 24 tzinfo (~> 0.3.29)
25   - activeresource (3.2.13)
26   - activemodel (= 3.2.13)
27   - activesupport (= 3.2.13)
28   - activesupport (3.2.13)
29   - i18n (= 0.6.1)
  25 + activeresource (3.2.15)
  26 + activemodel (= 3.2.15)
  27 + activesupport (= 3.2.15)
  28 + activesupport (3.2.15)
  29 + i18n (~> 0.6, >= 0.6.4)
30 30 multi_json (~> 1.0)
31 31 acts-as-taggable-on (2.4.1)
32 32 rails (>= 3, < 5)
... ... @@ -235,7 +235,7 @@ GEM
235 235 multi_json (~> 1.0)
236 236 multi_xml (>= 0.5.2)
237 237 httpauth (0.2.0)
238   - i18n (0.6.1)
  238 + i18n (0.6.5)
239 239 jasmine (1.3.2)
240 240 jasmine-core (~> 1.3.1)
241 241 rack (~> 1.0)
... ... @@ -278,7 +278,7 @@ GEM
278 278 minitest (4.7.4)
279 279 modernizr (2.6.2)
280 280 sprockets (~> 2.0)
281   - multi_json (1.8.0)
  281 + multi_json (1.8.2)
282 282 multi_xml (0.5.4)
283 283 multipart-post (1.2.0)
284 284 mysql2 (0.3.11)
... ... @@ -348,14 +348,14 @@ GEM
348 348 rack
349 349 rack-test (0.6.2)
350 350 rack (>= 1.0)
351   - rails (3.2.13)
352   - actionmailer (= 3.2.13)
353   - actionpack (= 3.2.13)
354   - activerecord (= 3.2.13)
355   - activeresource (= 3.2.13)
356   - activesupport (= 3.2.13)
  351 + rails (3.2.15)
  352 + actionmailer (= 3.2.15)
  353 + actionpack (= 3.2.15)
  354 + activerecord (= 3.2.15)
  355 + activeresource (= 3.2.15)
  356 + activesupport (= 3.2.15)
357 357 bundler (~> 1.0)
358   - railties (= 3.2.13)
  358 + railties (= 3.2.15)
359 359 rails-dev-tweaks (0.6.1)
360 360 actionpack (~> 3.1)
361 361 railties (~> 3.1)
... ... @@ -368,9 +368,9 @@ GEM
368 368 i18n
369 369 require_all
370 370 ruby-progressbar
371   - railties (3.2.13)
372   - actionpack (= 3.2.13)
373   - activesupport (= 3.2.13)
  371 + railties (3.2.15)
  372 + actionpack (= 3.2.15)
  373 + activesupport (= 3.2.15)
374 374 rack-ssl (~> 1.3.2)
375 375 rake (>= 0.8.7)
376 376 rdoc (~> 3.4)
... ... @@ -514,7 +514,7 @@ GEM
514 514 multi_json (~> 1.5)
515 515 twitter-stream (~> 0.1)
516 516 tins (0.11.0)
517   - treetop (1.4.14)
  517 + treetop (1.4.15)
518 518 polyglot
519 519 polyglot (>= 0.3.1)
520 520 turbolinks (1.2.0)
... ... @@ -523,7 +523,7 @@ GEM
523 523 eventmachine (>= 0.12.8)
524 524 http_parser.rb (~> 0.5.1)
525 525 simple_oauth (~> 0.1.4)
526   - tzinfo (0.3.37)
  526 + tzinfo (0.3.38)
527 527 uglifier (2.1.1)
528 528 execjs (>= 0.3.0)
529 529 multi_json (~> 1.0, >= 1.0.2)
... ... @@ -614,7 +614,7 @@ DEPENDENCIES
614 614 quiet_assets (~> 1.0.1)
615 615 rack-attack
616 616 rack-mini-profiler
617   - rails (= 3.2.13)
  617 + rails (= 3.2.15)
618 618 rails-dev-tweaks
619 619 rails_best_practices
620 620 raphael-rails (~> 2.1.2)
... ...