X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38640e0253e8984974d275f2c232eb057ba86c84..9d2f920feb9dce028b985e8d452538d3df7a1d9c:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index 79bc0d10e..e05edebc4 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "psych", :platforms => :ruby_20 gem "json" # Use postgres as the database -gem "pg" +gem "pg", "~> 0.18" # Use SCSS for stylesheets gem "sass-rails", "~> 5.0" @@ -48,7 +48,7 @@ gem "http_accept_language", "~> 2.0.0" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" -gem "paperclip", "~> 4.0" +gem "paperclip", "~> 5.2" gem "rack-cors" gem "rails-i18n", "~> 4.0.0" gem "record_tag_helper" @@ -119,9 +119,10 @@ end # Needed in development as well so rake can see konacha tasks group :development, :test do + gem "capybara", "~> 2.13" gem "coveralls", :require => false - gem "factory_girl_rails" + gem "factory_bot_rails" gem "jshint" - # gem "konacha" gem "poltergeist" + gem "puma", "~> 3.7" end