summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-10-07 22:20:22 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-10-08 21:04:11 -0400
commit0c8ac9815314d91bc32eff18502788480cd62d67 (patch)
tree21df44ee0a4ece7e5d348689503254a4f85a0348
parent680b6d88a5c0d63deeb2909f1c83e3630db87780 (diff)
downloadgitlab-ce-rs-remove-slim.tar.gz
Remove slimrs-remove-slim
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock5
2 files changed, 0 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 044dc30ecd4..abb76b7f7d0 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index f716c0254ec..ac4a1f5b007 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -673,9 +673,6 @@ GEM
tilt (>= 1.3, < 3)
six (0.2.0)
slack-notifier (1.2.1)
- slim (2.0.3)
- temple (~> 0.6.6)
- tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
spinach (0.8.10)
colorize
@@ -711,7 +708,6 @@ GEM
railties (>= 3.2.5, < 5)
teaspoon-jasmine (2.2.0)
teaspoon (>= 1.0.0)
- temple (0.6.10)
term-ansicolor (1.3.2)
tins (~> 1.0)
terminal-table (1.5.2)
@@ -919,7 +915,6 @@ DEPENDENCIES
sinatra (~> 1.4.4)
six (~> 0.2.0)
slack-notifier (~> 1.2.0)
- slim (~> 2.0.2)
spinach-rails (~> 0.2.1)
spring (~> 1.3.6)
spring-commands-rspec (~> 1.0.4)