Commit a4cbdbb10dc692d95407944ef6f0769700ac5ba3
1 parent
640b913a
Exists in
master
and in
4 other branches
Update rails to 3.2.16
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
28 additions
and
28 deletions
Show diff stats
Gemfile
@@ -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.15" | 11 | +gem "rails", "3.2.16" |
12 | 12 | ||
13 | # Supported DBs | 13 | # Supported DBs |
14 | gem "mysql2", group: :mysql | 14 | gem "mysql2", group: :mysql |
Gemfile.lock
1 | GEM | 1 | GEM |
2 | remote: https://rubygems.org/ | 2 | remote: https://rubygems.org/ |
3 | specs: | 3 | specs: |
4 | - actionmailer (3.2.15) | ||
5 | - actionpack (= 3.2.15) | 4 | + actionmailer (3.2.16) |
5 | + actionpack (= 3.2.16) | ||
6 | mail (~> 2.5.4) | 6 | mail (~> 2.5.4) |
7 | - actionpack (3.2.15) | ||
8 | - activemodel (= 3.2.15) | ||
9 | - activesupport (= 3.2.15) | 7 | + actionpack (3.2.16) |
8 | + activemodel (= 3.2.16) | ||
9 | + activesupport (= 3.2.16) | ||
10 | builder (~> 3.0.0) | 10 | builder (~> 3.0.0) |
11 | erubis (~> 2.7.0) | 11 | erubis (~> 2.7.0) |
12 | journey (~> 1.0.4) | 12 | journey (~> 1.0.4) |
@@ -14,18 +14,18 @@ GEM | @@ -14,18 +14,18 @@ GEM | ||
14 | rack-cache (~> 1.2) | 14 | rack-cache (~> 1.2) |
15 | rack-test (~> 0.6.1) | 15 | rack-test (~> 0.6.1) |
16 | sprockets (~> 2.2.1) | 16 | sprockets (~> 2.2.1) |
17 | - activemodel (3.2.15) | ||
18 | - activesupport (= 3.2.15) | 17 | + activemodel (3.2.16) |
18 | + activesupport (= 3.2.16) | ||
19 | builder (~> 3.0.0) | 19 | builder (~> 3.0.0) |
20 | - activerecord (3.2.15) | ||
21 | - activemodel (= 3.2.15) | ||
22 | - activesupport (= 3.2.15) | 20 | + activerecord (3.2.16) |
21 | + activemodel (= 3.2.16) | ||
22 | + activesupport (= 3.2.16) | ||
23 | arel (~> 3.0.2) | 23 | arel (~> 3.0.2) |
24 | tzinfo (~> 0.3.29) | 24 | tzinfo (~> 0.3.29) |
25 | - activeresource (3.2.15) | ||
26 | - activemodel (= 3.2.15) | ||
27 | - activesupport (= 3.2.15) | ||
28 | - activesupport (3.2.15) | 25 | + activeresource (3.2.16) |
26 | + activemodel (= 3.2.16) | ||
27 | + activesupport (= 3.2.16) | ||
28 | + activesupport (3.2.16) | ||
29 | i18n (~> 0.6, >= 0.6.4) | 29 | i18n (~> 0.6, >= 0.6.4) |
30 | multi_json (~> 1.0) | 30 | multi_json (~> 1.0) |
31 | acts-as-taggable-on (2.4.1) | 31 | acts-as-taggable-on (2.4.1) |
@@ -34,7 +34,7 @@ GEM | @@ -34,7 +34,7 @@ GEM | ||
34 | annotate (2.6.0.beta2) | 34 | annotate (2.6.0.beta2) |
35 | activerecord (>= 2.3.0) | 35 | activerecord (>= 2.3.0) |
36 | rake (>= 0.8.7) | 36 | rake (>= 0.8.7) |
37 | - arel (3.0.2) | 37 | + arel (3.0.3) |
38 | asciidoctor (0.1.3) | 38 | asciidoctor (0.1.3) |
39 | awesome_print (1.2.0) | 39 | awesome_print (1.2.0) |
40 | backports (3.3.2) | 40 | backports (3.3.2) |
@@ -235,7 +235,7 @@ GEM | @@ -235,7 +235,7 @@ GEM | ||
235 | multi_json (~> 1.0) | 235 | multi_json (~> 1.0) |
236 | multi_xml (>= 0.5.2) | 236 | multi_xml (>= 0.5.2) |
237 | httpauth (0.2.0) | 237 | httpauth (0.2.0) |
238 | - i18n (0.6.5) | 238 | + i18n (0.6.9) |
239 | jasmine (1.3.2) | 239 | jasmine (1.3.2) |
240 | jasmine-core (~> 1.3.1) | 240 | jasmine-core (~> 1.3.1) |
241 | rack (~> 1.0) | 241 | rack (~> 1.0) |
@@ -345,14 +345,14 @@ GEM | @@ -345,14 +345,14 @@ GEM | ||
345 | rack | 345 | rack |
346 | rack-test (0.6.2) | 346 | rack-test (0.6.2) |
347 | rack (>= 1.0) | 347 | rack (>= 1.0) |
348 | - rails (3.2.15) | ||
349 | - actionmailer (= 3.2.15) | ||
350 | - actionpack (= 3.2.15) | ||
351 | - activerecord (= 3.2.15) | ||
352 | - activeresource (= 3.2.15) | ||
353 | - activesupport (= 3.2.15) | 348 | + rails (3.2.16) |
349 | + actionmailer (= 3.2.16) | ||
350 | + actionpack (= 3.2.16) | ||
351 | + activerecord (= 3.2.16) | ||
352 | + activeresource (= 3.2.16) | ||
353 | + activesupport (= 3.2.16) | ||
354 | bundler (~> 1.0) | 354 | bundler (~> 1.0) |
355 | - railties (= 3.2.15) | 355 | + railties (= 3.2.16) |
356 | rails-dev-tweaks (0.6.1) | 356 | rails-dev-tweaks (0.6.1) |
357 | actionpack (~> 3.1) | 357 | actionpack (~> 3.1) |
358 | railties (~> 3.1) | 358 | railties (~> 3.1) |
@@ -365,9 +365,9 @@ GEM | @@ -365,9 +365,9 @@ GEM | ||
365 | i18n | 365 | i18n |
366 | require_all | 366 | require_all |
367 | ruby-progressbar | 367 | ruby-progressbar |
368 | - railties (3.2.15) | ||
369 | - actionpack (= 3.2.15) | ||
370 | - activesupport (= 3.2.15) | 368 | + railties (3.2.16) |
369 | + actionpack (= 3.2.16) | ||
370 | + activesupport (= 3.2.16) | ||
371 | rack-ssl (~> 1.3.2) | 371 | rack-ssl (~> 1.3.2) |
372 | rake (>= 0.8.7) | 372 | rake (>= 0.8.7) |
373 | rdoc (~> 3.4) | 373 | rdoc (~> 3.4) |
@@ -611,7 +611,7 @@ DEPENDENCIES | @@ -611,7 +611,7 @@ DEPENDENCIES | ||
611 | quiet_assets (~> 1.0.1) | 611 | quiet_assets (~> 1.0.1) |
612 | rack-attack | 612 | rack-attack |
613 | rack-mini-profiler | 613 | rack-mini-profiler |
614 | - rails (= 3.2.15) | 614 | + rails (= 3.2.16) |
615 | rails-dev-tweaks | 615 | rails-dev-tweaks |
616 | rails_best_practices | 616 | rails_best_practices |
617 | raphael-rails (~> 2.1.2) | 617 | raphael-rails (~> 2.1.2) |