summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-11-30 16:49:09 +0000
committerValery Sizov <valery@gitlab.com>2015-11-30 16:49:09 +0000
commite0131c5d07f22681e4118473dbfa0dd93df12b28 (patch)
tree7868f5342d9ef59b598d5a72d8615573e3cd9fb3 /Gemfile
parenta8e05cec000f3d2b17b966115c9d7b69629498db (diff)
parentf1504e1ad52df7aec241b93d0d015da13ddce5a9 (diff)
downloadgitlab-ce-e0131c5d07f22681e4118473dbfa0dd93df12b28.tar.gz
Merge branch 'rails_update_to_4_2' into 'master'
Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile10
1 files changed, 8 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 51ce6c9ed72..67640bb9ae0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,10 @@
source "https://rubygems.org"
-gem 'rails', '4.1.14'
+gem 'rails', '4.2.4'
+gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+
+# Responders respond_to and respond_with
+gem 'responders', '~> 2.0'
# Specify a sprockets version due to security issue
# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
@@ -95,6 +99,7 @@ gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.2'
+gem 'net-ssh', '~> 3.0.1'
# Diffs
gem 'diffy', '~> 3.0.3'
@@ -210,6 +215,7 @@ group :development do
gem 'rerun', '~> 0.10.0'
gem 'bullet', require: false
gem 'rblineprof', platform: :mri, require: false
+ gem 'web-console', '~> 2.0'
# Better errors handler
gem 'better_errors', '~> 1.0.1'
@@ -266,7 +272,7 @@ group :test do
gem 'shoulda-matchers', '~> 2.8.0', require: false
gem 'email_spec', '~> 1.6.0'
gem 'webmock', '~> 1.21.0'
- gem 'test_after_commit', '~> 0.2.2'
+ gem 'test_after_commit', '~> 0.4.2'
gem 'sham_rack'
end