From 5b056493ace36e71eda5c3a734f2febef9de1e03 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Wed, 21 Mar 2018 15:57:50 +0100
Subject: [PATCH] Use slim and js for rails g and remove now unused
 coffee-rails dependency

---
 Gemfile      | 3 +--
 Gemfile.lock | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 076ed2aa..78349a16 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,6 @@ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
 gem 'bcrypt'
 gem 'bootstrap-will_paginate'
 gem 'carrierwave'
-gem 'coffee-rails'
 gem 'concurrent-ruby'
 gem 'concurrent-ruby-ext', platform: :ruby
 gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
@@ -28,7 +27,7 @@ gem 'ransack'
 gem 'rubytree'
 gem 'sass-rails'
 gem 'sdoc', group: :doc
-gem 'slim'
+gem 'slim-rails'
 gem 'bootstrap_pagedown'
 gem 'pagedown-rails'
 gem 'sorcery'
diff --git a/Gemfile.lock b/Gemfile.lock
index 456aeb24..33063e62 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -316,6 +316,10 @@ GEM
     slim (3.0.9)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
+    slim-rails (3.1.3)
+      actionpack (>= 3.1)
+      railties (>= 3.1)
+      slim (~> 3.0)
     sorcery (0.11.0)
       bcrypt (~> 3.1)
       oauth (~> 0.4, >= 0.4.4)
@@ -385,7 +389,6 @@ DEPENDENCIES
   capybara
   carrierwave
   codeclimate-test-reporter
-  coffee-rails
   concurrent-ruby
   concurrent-ruby-ext
   d3-rails (~> 4.0)
@@ -425,7 +428,7 @@ DEPENDENCIES
   sdoc
   selenium-webdriver
   simplecov
-  slim
+  slim-rails
   sorcery
   spring
   thread_safe