X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/255b0b94252b48a9fe4326bb9d9fc4f184308460..22408c3e5bbce14b70b56be3a02122e2db3de896:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index f8fa61130..1521ea0e6 100644 --- a/Gemfile +++ b/Gemfile @@ -24,9 +24,6 @@ gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' -# See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby - # Use jquery as the JavaScript library gem 'jquery-rails' @@ -41,15 +38,15 @@ gem 'r2' gem 'ejs' # Load rails plugins -gem 'rails-i18n', ">= 0.6.3" +gem 'rails-i18n', "~> 4.0.0" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' -gem 'openstreetmap-oauth-plugin', '>= 0.4.1.1', :require => 'oauth-plugin' +gem 'oauth-plugin', '>= 0.5.1' gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' gem 'composite_primary_keys', '>= 6.0.0' -gem 'http_accept_language', '~> 1.0.2' -gem 'paperclip', '~> 2.0' +gem 'http_accept_language', '~> 2.0.0' +gem 'paperclip', '~> 3.0' gem 'deadlock_retry', '>= 1.2.0' gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js' gem 'rack-cors'