diff options
| author | Zakaria BOUZIANE | 2015-03-10 12:04:25 +0100 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2015-03-10 12:04:25 +0100 |
| commit | e3cd779d28af135dc32b25ba249be48ebf6658bf (patch) | |
| tree | 5f59356149e5eb58f7bf9459db5c2229a0d278ca /Gemfile.lock | |
| parent | 8d9281dcc994ad76092b4878b26801507915f16a (diff) | |
| parent | dc6fc17f5ea46c871154e398037fab3bb741504e (diff) | |
| download | chouette-core-e3cd779d28af135dc32b25ba249be48ebf6658bf.tar.bz2 | |
Merged code
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7af94576d..5734b072a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -172,6 +172,10 @@ GEM actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) hashie (3.4.0) + hashie_rails (0.0.2) + activesupport (~> 4.0) + hashie (>= 3.0) + highline (1.6.15) hike (1.2.3) hitimes (1.2.2) i18n (0.7.0) @@ -304,7 +308,6 @@ GEM activesupport (>= 3.0) i18n polyamorous (~> 1.1) - raphael-rails (2.1.2) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -445,6 +448,7 @@ DEPENDENCIES guard guard-rspec hashie + hashie_rails (~> 0.0.2) inherited_resources jbuilder (~> 2.0) jquery-rails @@ -458,7 +462,6 @@ DEPENDENCIES map_layers (= 0.0.4) meta_request modernizr-rails (~> 2.0.6) - morrisjs-rails ninoxe! pg poltergeist @@ -467,6 +470,8 @@ DEPENDENCIES rails-assets-bootstrap-sass-official (~> 3.3.0) rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3) rails-assets-jquery-tokeninput (~> 1.7.0) + rails-assets-morrisjs (~> 0.5.1) + rails-assets-raphael (~> 2.1.3) rails-assets-respond rails-assets-tagmanager (~> 3.0.1.0) rails-assets-typeahead.js (~> 0.10.5) @@ -474,7 +479,6 @@ DEPENDENCIES rails-erd rails-i18n (~> 4.0.0) ransack - raphael-rails rb-fsevent rb-inotify roo |