X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/effb1b7f4170bb7244c4dfffcbe6134fe00e2bc4..fe644bbd722b2a2e9be8c80ae05f2594b3e2ea60:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index 43f39340a..9d759548c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "5.1.4" +gem "rails", "5.2.0" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -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" @@ -31,6 +31,9 @@ gem "jquery-rails" # gem 'jbuilder', '~> 2.0' gem "jsonify-rails" +# Reduces boot times through caching; required in config/boot.rb +gem "bootsnap", ">= 1.1.0", :require => false + # Use R2 for RTL conversion gem "r2", "~> 0.2.7" @@ -42,19 +45,22 @@ gem "image_optim_rails" # Load rails plugins gem "actionpack-page_caching" -gem "composite_primary_keys", "~> 10.0.0" +gem "composite_primary_keys", "~> 11.0.0" gem "dynamic_form" 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" gem "rinku", ">= 1.2.2", :require => "rails_rinku" gem "validates_email_format_of", ">= 1.5.1" +# Native OSM extensions +gem "quad_tile", "~> 1.0.1" + # Sanitise URIs gem "rack-uri_sanitizer" @@ -108,6 +114,8 @@ gem "logstasher" # Gems useful for development group :development do gem "annotate" + gem "better_errors" + gem "binding_of_caller" gem "listen" gem "vendorer" end @@ -115,7 +123,6 @@ end # Gems needed for running tests group :test do gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20] - gem "minitest-rails-capybara" gem "rails-controller-testing" gem "rubocop" gem "webmock"