diff --git a/Gemfile b/Gemfile index 82dcba6c..08f5461e 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 221556cc..d167b88c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -320,6 +320,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) @@ -390,7 +394,6 @@ DEPENDENCIES capybara-selenium carrierwave codeclimate-test-reporter - coffee-rails concurrent-ruby concurrent-ruby-ext d3-rails (~> 4.0) @@ -430,7 +433,7 @@ DEPENDENCIES sass-rails sdoc simplecov - slim + slim-rails sorcery spring thread_safe