summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-13 17:14:46 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-13 17:14:46 -0500
commit0958f331d1af67514c80f0bc582c93b0ae1ed491 (patch)
tree512f37d66e349b1b9e6420cf7739aea7ee1ac324 /Gemfile
parent509654b3784da2a084a0c8303e9c6cc1498b8d2b (diff)
parentd7a28f3c12950d56a187148fda9dce39a9f2bf08 (diff)
downloadgitlab-ce-0958f331d1af67514c80f0bc582c93b0ae1ed491.tar.gz
Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts: # config/initializers/1_settings.rb
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index c7db12a1947..91ad1706a07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -198,7 +198,7 @@ gem 'licensee', '~> 8.0.0'
gem "rack-attack", '~> 4.3.1'
# Ace editor
-gem 'ace-rails-ap', '~> 2.0.1'
+gem 'ace-rails-ap', '~> 4.0.2'
# Keyboard shortcuts
gem 'mousetrap-rails', '~> 1.4.6'
@@ -219,7 +219,6 @@ gem 'gitlab_emoji', '~> 0.3.0'
gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0'
-gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 5.0.0'
gem 'raphael-rails', '~> 2.1.2'
gem 'request_store', '~> 1.3.0'
@@ -244,7 +243,6 @@ group :development do
gem "foreman"
gem 'brakeman', '~> 3.2.0', require: false
- gem "annotate", "~> 2.7.0"
gem 'letter_opener_web', '~> 1.3.0'
gem 'quiet_assets', '~> 1.0.2'
gem 'rerun', '~> 0.11.0'
@@ -327,7 +325,6 @@ gem "mail_room", "~> 0.7"
gem 'email_reply_parser', '~> 0.5.8'
## CI
-gem 'activerecord-deprecated_finders', '~> 1.0.3'
gem 'activerecord-session_store', '~> 0.1.0'
gem "nested_form", '~> 0.3.2'
@@ -336,3 +333,6 @@ gem 'oauth2', '~> 1.0.0'
# Soft deletion
gem "paranoia", "~> 2.0"
+
+# Health check
+gem 'health_check', '~> 1.5.1'