Update Gemfile and add .idea to gitignore

3 files changed, 52 insertions, 52 deletions

diff --git a/.gitignore b/.gitignore
index cc3e0cd16..8b21c30a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@ chouette2.war
 vendor/bundle
 .ruby-version
 coverage
+
+# IDE
+.idea
diff --git a/Gemfile b/Gemfile
index 9fd592a9e..78d1d17e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.10'
+gem 'rails', '~> 4.1.10'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.3'
@@ -36,13 +36,13 @@ gem 'spring', group: :development
 # gem 'debugger', group: [:development, :test]
 
 # API Rest
-gem 'sawyer', "~> 0.6.0"
+gem 'sawyer', '~> 0.6.0'
 gem 'faraday_middleware', '~> 0.9.1'
 
 platforms :jruby do
   gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.3'
   gem 'jruby-openssl'
-  gem "jruby-rack-worker"
+  gem 'jruby-rack-worker'
   gem 'warbler'
   gem 'therubyrhino'
 end
@@ -53,51 +53,28 @@ platforms :ruby do
   gem 'sqlite3'
 end
 
-# I18n
-gem 'rails-i18n', '~> 4.0.0'
-
 # Authentication
 gem 'devise', '~> 3.4.0'
-gem 'devise-i18n'
 gem 'devise-encryptable'
 gem 'devise_invitable'
 
 # Map, Geolocalization
-gem "map_layers", "0.0.4"
-gem "georuby-ext", "0.0.5"
-gem "georuby", "2.3.0" # Fix version for georuby-ext because api has changed
+gem 'map_layers', '0.0.4'
+gem 'georuby-ext', '0.0.5'
+gem 'georuby', '2.3.0' # Fix version for georuby-ext because api has changed
 
 gem 'mimemagic'
 
 # User interface
 gem 'language_engine', '0.0.6'
-gem 'calendar_helper', "0.2.5"
+gem 'calendar_helper', '0.2.5'
 gem 'cocoon'
-gem 'formtastic', "2.3.1"
+gem 'formtastic', '2.3.1'
 gem 'RedCloth'
 gem 'simple_form', '~> 3.1.0'
 gem 'font-awesome-sass', '~> 4.2.0'
 gem 'will_paginate-bootstrap', '~> 1.0.1'
-gem "breadcrumbs_on_rails"
-
-# TODO : Move these resources to rails assets
-gem "modernizr-rails", "~> 2.0.6"
-
-# Javascript
-source 'https://rails-assets.org' do
-  gem 'rails-assets-morrisjs',   '~> 0.5.1'
-  gem 'rails-assets-raphael',    '~> 2.1.3'
-  gem 'rails-assets-footable',   '~> 2.0.3'
-
-  # Use twitter bootstrap resources
-  gem 'rails-assets-bootstrap-sass-official', '~> 3.3.0'
-  gem 'rails-assets-tagmanager', '~> 3.0.1.0'
-  gem 'rails-assets-typeahead.js', '~> 0.10.5'
-  gem 'rails-assets-typeahead.js-bootstrap3.less'
-  gem 'rails-assets-respond'
-  gem 'rails-assets-eonasdan-bootstrap-datetimepicker', '~> 3.1.3'
-  gem 'rails-assets-jquery-tokeninput', '~> 1.7.0'
-end
+gem 'breadcrumbs_on_rails'
 
 # Format Output
 gem 'json'
@@ -115,31 +92,29 @@ gem 'squeel'
 
 gem 'enumerize', '~> 0.10.0'
 
-#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
 gem 'ninoxe', '1.2.3'
-#gem 'ninoxe',:path => '~/workspace/chouette/ninoxe'
+#gem 'ninoxe', github: 'afimb/ninoxe'
+#gem 'ninoxe', path: '~/workspace/chouette/ninoxe'
 
 gem 'acts_as_list', '~> 0.6.0'
-gem "acts_as_tree", '~> 2.1.0', :require => "acts_as_tree"
+gem 'acts_as_tree', '~> 2.1.0', require: 'acts_as_tree'
 
 gem 'rabl'
 
 gem 'delayed_job_active_record'
 gem 'devise-async'
-gem 'apartment', "~> 1.0.0"
-
-gem 'newrelic_rpm'
+gem 'apartment', '~> 1.0.0'
 
 group :development do
-  gem 'capistrano',        '2.13.5'
+  gem 'capistrano', '2.13.5'
   gem 'capistrano-ext'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rails-erd'
   gem 'meta_request'
   gem 'letter_opener'
-  gem 'quiet_assets',      '~> 1.0'
-  gem 'simplecov',         '~> 0.10.0'
+  gem 'quiet_assets', '~> 1.0'
+  gem 'simplecov', '~> 0.10.0'
   platforms :ruby_20, :ruby_21, :ruby_22 do
     gem 'better_errors'
     gem 'binding_of_caller'
@@ -148,21 +123,43 @@ end
 
 group :test, :development do
   gem 'pry-rails'
-  gem "rspec-rails", "~> 3.1.0"
-  gem "fakeweb"
-  gem 'capybara', "~> 2.4.0"
+  gem 'rspec-rails', '~> 3.1.0'
+  gem 'fakeweb'
+  gem 'capybara', '~> 2.4.0'
   gem 'poltergeist'
   gem 'launchy'
   gem 'factory_girl_rails', '~> 4.0'
-  # gem 'i18n-tasks'
-  gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
-  gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
+  gem 'rb-inotify', require: RUBY_PLATFORM.include?('linux') && 'rb-inotify'
+  gem 'rb-fsevent', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
   gem 'transpec'
   gem 'database_cleaner'
   gem 'shoulda-matchers'
 end
 
 group :production do
-   gem "SyslogLogger", :require => "syslog/logger"
-   gem "daemons"
+  gem 'SyslogLogger', require: 'syslog/logger'
+  gem 'daemons'
+  gem 'newrelic_rpm'
+end
+
+# I18n
+gem 'rails-i18n', '~> 4.0.0'
+gem 'devise-i18n'
+
+# Rails Assets
+source 'https://rails-assets.org' do
+  gem 'rails-assets-morrisjs', '~> 0.5.1'
+  gem 'rails-assets-raphael', '~> 2.1.3'
+  gem 'rails-assets-footable', '~> 2.0.3'
+
+  # Use twitter bootstrap resources
+  gem 'rails-assets-bootstrap-sass-official', '~> 3.3.0'
+  gem 'rails-assets-tagmanager', '~> 3.0.1.0'
+  gem 'rails-assets-typeahead.js', '~> 0.10.5'
+  gem 'rails-assets-typeahead.js-bootstrap3.less'
+  gem 'rails-assets-respond'
+  gem 'rails-assets-eonasdan-bootstrap-datetimepicker', '~> 3.1.3'
+  gem 'rails-assets-jquery-tokeninput', '~> 1.7.0'
+
+  gem 'rails-assets-modernizr', '~> 2.0.6'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 652a04087..6be7ca18f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -232,7 +232,6 @@ GEM
     mimemagic (0.3.0)
     mini_portile (0.6.2)
     minitest (5.8.2)
-    modernizr-rails (2.0.6)
     multi_json (1.11.2)
     multipart-post (2.0.0)
     nenv (0.2.0)
@@ -315,6 +314,7 @@ GEM
     rails-assets-jquery-tokeninput (1.7.0)
       rails-assets-jquery (>= 1.5)
     rails-assets-mocha (1.17.1)
+    rails-assets-modernizr (2.0.6)
     rails-assets-moment (2.10.3)
     rails-assets-morrisjs (0.5.1)
       rails-assets-jquery (>= 2.1.0)
@@ -525,7 +525,6 @@ DEPENDENCIES
   map_layers (= 0.0.4)
   meta_request
   mimemagic
-  modernizr-rails (~> 2.0.6)
   newrelic_rpm
   ninoxe (= 1.2.3)
   pg
@@ -533,11 +532,12 @@ DEPENDENCIES
   pry-rails
   quiet_assets (~> 1.0)
   rabl
-  rails (= 4.1.10)
+  rails (~> 4.1.10)
   rails-assets-bootstrap-sass-official (~> 3.3.0)!
   rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3)!
   rails-assets-footable (~> 2.0.3)!
   rails-assets-jquery-tokeninput (~> 1.7.0)!
+  rails-assets-modernizr (~> 2.0.6)!
   rails-assets-morrisjs (~> 0.5.1)!
   rails-assets-raphael (~> 2.1.3)!
   rails-assets-respond!