Download as
Browse Code »

Commit 09c6f663e97a4b71268357330401405844b88dc0

Authored by Dmitriy Zaporozhets
2 parents b56f85c0 92b8b9c4

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
  Diff comments   View file @09c6f66
... ... @@ -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.15"
  11 +gem "rails", "3.2.16"
12 12  
13 13 # Supported DBs
14 14 gem "mysql2", group: :mysql
... ...
Gemfile.lock
  Diff comments   View file @09c6f66
1 1 GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4   - actionmailer (3.2.15)
5   - actionpack (= 3.2.15)
  4 + actionmailer (3.2.16)
  5 + actionpack (= 3.2.16)
6 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 10 builder (~> 3.0.0)
11 11 erubis (~> 2.7.0)
12 12 journey (~> 1.0.4)
... ... @@ -14,18 +14,18 @@ GEM
14 14 rack-cache (~> 1.2)
15 15 rack-test (~> 0.6.1)
16 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 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 23 arel (~> 3.0.2)
24 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 29 i18n (~> 0.6, >= 0.6.4)
30 30 multi_json (~> 1.0)
31 31 acts-as-taggable-on (2.4.1)
... ... @@ -34,7 +34,7 @@ GEM
34 34 annotate (2.6.0.beta2)
35 35 activerecord (>= 2.3.0)
36 36 rake (>= 0.8.7)
37   - arel (3.0.2)
  37 + arel (3.0.3)
38 38 asciidoctor (0.1.3)
39 39 awesome_print (1.2.0)
40 40 backports (3.3.2)
... ... @@ -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.5)
  238 + i18n (0.6.9)
239 239 jasmine (1.3.2)
240 240 jasmine-core (~> 1.3.1)
241 241 rack (~> 1.0)
... ... @@ -348,14 +348,14 @@ GEM
348 348 rack
349 349 rack-test (0.6.2)
350 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 357 bundler (~> 1.0)
358   - railties (= 3.2.15)
  358 + railties (= 3.2.16)
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.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 374 rack-ssl (~> 1.3.2)
375 375 rake (>= 0.8.7)
376 376 rdoc (~> 3.4)
... ... @@ -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.15)
  617 + rails (= 3.2.16)
618 618 rails-dev-tweaks
619 619 rails_best_practices
620 620 raphael-rails (~> 2.1.2)
... ...
VERSION
  Diff comments   View file @09c6f66
1   -6.3.0
  1 +6.3.1
... ...