From 9fcbf0855f97d253475674618ac33065cb152663 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Sun, 19 Apr 2015 20:43:23 +0900 Subject: bundle update --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9ff2507..f1a2f0c 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem "yajl-ruby", require: "yajl" gem "grape", "~> 0.9.0" gem "grape-rabl" gem "haml-rails" -gem "sass-rails", "~> 5.0" +gem "sass-rails" gem "coffee-rails" gem "jbuilder" gem "uglifier" diff --git a/Gemfile.lock b/Gemfile.lock index 70ca0ed..f09920c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -341,10 +341,10 @@ GEM coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - web-console (2.0.0) - activemodel (~> 4.0) + web-console (2.1.2) + activemodel (>= 4.0) binding_of_caller (>= 0.7.2) - railties (~> 4.0) + railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) webmock (1.21.0) addressable (>= 2.3.6) @@ -381,7 +381,7 @@ DEPENDENCIES rails (~> 4.2.1) rspec rspec-rails - sass-rails (~> 5.0) + sass-rails settingslogic simplecov spring -- cgit v1.2.3