Commit 09c6f663e97a4b71268357330401405844b88dc0
Merge branch '6-3-1-stable' of /home/git/repositories/gitlab/gitlabhq into 6-3-stable
Showing
3 changed files
with
29 additions
and
29 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) |
| @@ -348,14 +348,14 @@ GEM | @@ -348,14 +348,14 @@ GEM | ||
| 348 | rack | 348 | rack |
| 349 | rack-test (0.6.2) | 349 | rack-test (0.6.2) |
| 350 | rack (>= 1.0) | 350 | rack (>= 1.0) |
| 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) | 351 | + rails (3.2.16) |
| 352 | + actionmailer (= 3.2.16) | ||
| 353 | + actionpack (= 3.2.16) | ||
| 354 | + activerecord (= 3.2.16) | ||
| 355 | + activeresource (= 3.2.16) | ||
| 356 | + activesupport (= 3.2.16) | ||
| 357 | bundler (~> 1.0) | 357 | bundler (~> 1.0) |
| 358 | - railties (= 3.2.15) | 358 | + railties (= 3.2.16) |
| 359 | rails-dev-tweaks (0.6.1) | 359 | rails-dev-tweaks (0.6.1) |
| 360 | actionpack (~> 3.1) | 360 | actionpack (~> 3.1) |
| 361 | railties (~> 3.1) | 361 | railties (~> 3.1) |
| @@ -368,9 +368,9 @@ GEM | @@ -368,9 +368,9 @@ GEM | ||
| 368 | i18n | 368 | i18n |
| 369 | require_all | 369 | require_all |
| 370 | ruby-progressbar | 370 | ruby-progressbar |
| 371 | - railties (3.2.15) | ||
| 372 | - actionpack (= 3.2.15) | ||
| 373 | - activesupport (= 3.2.15) | 371 | + railties (3.2.16) |
| 372 | + actionpack (= 3.2.16) | ||
| 373 | + activesupport (= 3.2.16) | ||
| 374 | rack-ssl (~> 1.3.2) | 374 | rack-ssl (~> 1.3.2) |
| 375 | rake (>= 0.8.7) | 375 | rake (>= 0.8.7) |
| 376 | rdoc (~> 3.4) | 376 | rdoc (~> 3.4) |
| @@ -614,7 +614,7 @@ DEPENDENCIES | @@ -614,7 +614,7 @@ DEPENDENCIES | ||
| 614 | quiet_assets (~> 1.0.1) | 614 | quiet_assets (~> 1.0.1) |
| 615 | rack-attack | 615 | rack-attack |
| 616 | rack-mini-profiler | 616 | rack-mini-profiler |
| 617 | - rails (= 3.2.15) | 617 | + rails (= 3.2.16) |
| 618 | rails-dev-tweaks | 618 | rails-dev-tweaks |
| 619 | rails_best_practices | 619 | rails_best_practices |
| 620 | raphael-rails (~> 2.1.2) | 620 | raphael-rails (~> 2.1.2) |
VERSION