diff options
| author | Luc Donnet | 2014-07-25 09:14:06 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-07-25 09:14:06 +0200 |
| commit | f7f78c329a33b39ae35fed58da334a571899acad (patch) | |
| tree | 016b6dda96375866ffb65dc1bdd18a2aea2a7918 /Gemfile.lock | |
| parent | 8262842ac7872cf8cd082da92e7a1be6076c2dd8 (diff) | |
| parent | eb4b8e63a3e1353f152910ccc29e6b0b36ea1788 (diff) | |
| download | chouette-core-f7f78c329a33b39ae35fed58da334a571899acad.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c9796a062..540828bd1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,6 +72,8 @@ GEM bcrypt-ruby (3.0.1-java) bootstrap-sass (3.1.1.1) sass (~> 3.2) + bootstrap-typeahead-rails (0.9.3.3) + railties (>= 3.0) bootswatch-rails (3.1.1.1) railties (>= 3.1) bouncy-castle-java (1.5.0146.1) @@ -138,6 +140,8 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) fastercsv (1.5.5) ffi (1.9.3) ffi (1.9.3-java) @@ -214,6 +218,7 @@ GEM morrisjs-rails (0.4.3) railties (> 3.1, < 5) multi_json (1.10.1) + multipart-post (2.0.0) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -223,6 +228,9 @@ GEM net-ssh (>= 1.99.1) nokogiri (1.5.10) nokogiri (1.5.10-java) + nominatim (0.0.5) + faraday + multi_json open4 (1.3.0) orm_adapter (0.4.0) pg (0.11.0) @@ -375,6 +383,7 @@ DEPENDENCIES acts_as_list (= 0.1.6) acts_as_tree-1.8 (= 1.1.0) bootstrap-sass (~> 3.1.1) + bootstrap-typeahead-rails bootswatch-rails calendar_helper (= 0.2.5) capistrano @@ -410,6 +419,7 @@ DEPENDENCIES modernizr-rails (~> 2.0.6) morrisjs-rails ninoxe! + nominatim pg (~> 0.11.0) rabl rails (= 3.2.18) |