summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-10 23:12:37 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-10 23:12:37 +0000
commit03b7fe71a5c5372fc8239a26e757685ab12eed87 (patch)
tree90a25ae6f72f959ed4e247a701b9f086d64b2844 /Gemfile
parentc007d4a9819b1d7992259bc70ef3059955c25a65 (diff)
parent0c8ac9815314d91bc32eff18502788480cd62d67 (diff)
downloadgitlab-ce-03b7fe71a5c5372fc8239a26e757685ab12eed87.tar.gz
Merge branch 'rs-remove-slim' into 'master'
Remove slim Closes #2897 See merge request !1537
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index b3e05407c9c..e8cdb7a4a97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -128,7 +128,6 @@ gem 'after_commit_queue'
gem 'acts-as-taggable-on', '~> 3.4'
# Background jobs
-gem 'slim', '~> 2.0.2'
gem 'sinatra', '~> 1.4.4', require: nil
gem 'sidekiq', '3.3.0'
gem 'sidetiq', '~> 0.6.3'