diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-10 23:12:37 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-10 23:12:37 +0000 |
| commit | 03b7fe71a5c5372fc8239a26e757685ab12eed87 (patch) | |
| tree | 90a25ae6f72f959ed4e247a701b9f086d64b2844 | |
| parent | c007d4a9819b1d7992259bc70ef3059955c25a65 (diff) | |
| parent | 0c8ac9815314d91bc32eff18502788480cd62d67 (diff) | |
| download | gitlab-ce-03b7fe71a5c5372fc8239a26e757685ab12eed87.tar.gz | |
Merge branch 'rs-remove-slim' into 'master'
Remove slim
Closes #2897
See merge request !1537
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 0 insertions, 6 deletions
@@ -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 ef91604d8be..9911904d304 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -672,9 +672,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 @@ -710,7 +707,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) @@ -915,7 +911,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) |