diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2015-04-19 20:43:23 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2015-04-19 20:43:23 +0900 |
| commit | 9fcbf0855f97d253475674618ac33065cb152663 (patch) | |
| tree | ff2c4186ad7e33d955429b2353e2094502baf2a6 | |
| parent | f99a3eb1d9f54c82397bc868162bcbe7bf598b3a (diff) | |
| download | aclog-9fcbf0855f97d253475674618ac33065cb152663.tar.gz | |
bundle update
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -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 |