aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile109
1 files changed, 56 insertions, 53 deletions
diff --git a/Gemfile b/Gemfile
index ae9412a77..7785c559e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,18 +1,17 @@
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'
# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '~> 2.7.2'
# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'
# Use jquery as the JavaScript library
-gem 'jquery-rails'
-gem 'jquery-ui-sass-rails'
+gem 'jquery-rails', '~> 3.1.4' # Update to v4 for Rails 4.2
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -36,13 +35,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 +52,32 @@ platforms :ruby do
gem 'sqlite3'
end
-# I18n
-gem 'rails-i18n', '~> 4.0.0'
+gem 'activerecord-postgis-adapter'
+gem 'polylines'
# 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 'rgeo', '~> 0.5.2'
+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,32 +95,32 @@ gem 'squeel'
gem 'enumerize', '~> 0.10.0'
-#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => "rails4"
-#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
-#gem 'ninoxe',:path => '~/Projets/cityway/ninoxe'
-gem 'ninoxe', '1.2.0'
+#gem 'ninoxe', '1.2.4'
+gem 'ninoxe', git: 'https://github.com/afimb/ninoxe.git'
+#gem 'ninoxe', path: '../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 'apartment', '~> 1.0.0'
gem 'newrelic_rpm'
+gem 'letter_opener'
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'
+ # MetaRequest is incompatible with rgeo-activerecord
+ # gem 'meta_request'
+ 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'
@@ -149,20 +129,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'
+end
+
+# I18n
+gem 'rails-i18n', '~> 4.0.0'
+gem 'devise-i18n'
+
+# Rails Assets
+source 'http://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'
+ gem 'rails-assets-jquery-ui', '~> 1.11.4'
end