summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-05 15:17:30 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-05 15:17:30 +0000
commit09c6f663e97a4b71268357330401405844b88dc0 (patch)
treeedee5c8d6910105782bec97740e4959ec2eaba97
parentb56f85c04fb16a5dd1801135f6a6fc099d6317ff (diff)
parent92b8b9c41a3892cc3f58704246beddab5023f69a (diff)
downloadgitlab-ce-6-3-stable.tar.gz
Merge branch '6-3-1-stable' of /home/git/repositories/gitlab/gitlabhq into 6-3-stablev6.3.16-3-stable
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock54
-rw-r--r--VERSION2
3 files changed, 29 insertions, 29 deletions
diff --git a/Gemfile b/Gemfile
index a543c5e3a6d..f0d291055be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ def linux_only(require_as)
RUBY_PLATFORM.include?('linux') && require_as
end
-gem "rails", "3.2.15"
+gem "rails", "3.2.16"
# Supported DBs
gem "mysql2", group: :mysql
diff --git a/Gemfile.lock b/Gemfile.lock
index 4be72d2fbc6..7df4db39406 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.15)
- actionpack (= 3.2.15)
+ actionmailer (3.2.16)
+ actionpack (= 3.2.16)
mail (~> 2.5.4)
- actionpack (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
+ actionpack (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -14,18 +14,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.15)
- activesupport (= 3.2.15)
+ activemodel (3.2.16)
+ activesupport (= 3.2.16)
builder (~> 3.0.0)
- activerecord (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
+ activerecord (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
- activesupport (3.2.15)
+ activeresource (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
+ activesupport (3.2.16)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
acts-as-taggable-on (2.4.1)
@@ -34,7 +34,7 @@ GEM
annotate (2.6.0.beta2)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
- arel (3.0.2)
+ arel (3.0.3)
asciidoctor (0.1.3)
awesome_print (1.2.0)
backports (3.3.2)
@@ -235,7 +235,7 @@ GEM
multi_json (~> 1.0)
multi_xml (>= 0.5.2)
httpauth (0.2.0)
- i18n (0.6.5)
+ i18n (0.6.9)
jasmine (1.3.2)
jasmine-core (~> 1.3.1)
rack (~> 1.0)
@@ -348,14 +348,14 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.15)
- actionmailer (= 3.2.15)
- actionpack (= 3.2.15)
- activerecord (= 3.2.15)
- activeresource (= 3.2.15)
- activesupport (= 3.2.15)
+ rails (3.2.16)
+ actionmailer (= 3.2.16)
+ actionpack (= 3.2.16)
+ activerecord (= 3.2.16)
+ activeresource (= 3.2.16)
+ activesupport (= 3.2.16)
bundler (~> 1.0)
- railties (= 3.2.15)
+ railties (= 3.2.16)
rails-dev-tweaks (0.6.1)
actionpack (~> 3.1)
railties (~> 3.1)
@@ -368,9 +368,9 @@ GEM
i18n
require_all
ruby-progressbar
- railties (3.2.15)
- actionpack (= 3.2.15)
- activesupport (= 3.2.15)
+ railties (3.2.16)
+ actionpack (= 3.2.16)
+ activesupport (= 3.2.16)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -614,7 +614,7 @@ DEPENDENCIES
quiet_assets (~> 1.0.1)
rack-attack
rack-mini-profiler
- rails (= 3.2.15)
+ rails (= 3.2.16)
rails-dev-tweaks
rails_best_practices
raphael-rails (~> 2.1.2)
diff --git a/VERSION b/VERSION
index 798e38995c4..dc0208aba8e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.3.0
+6.3.1