X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a570f59187efa0a298d31bae2b224de9762bb42f..384c83a2485319fbcc971e1327ee03c08158b724:/Gemfile diff --git a/Gemfile b/Gemfile index 9a3fb1f6b..a5b7d401f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.2.1" - -# Require things which have moved to gems in ruby 1.9 -gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 - -# Require things which have moved to gems in ruby 2.0 -gem "psych", :platforms => :ruby_20 +gem "rails", "6.0.3.6" # Require json for multi_json gem "json" @@ -41,20 +35,20 @@ gem "image_optim_rails" # Load rails plugins gem "actionpack-page_caching", ">= 1.2.0" -gem "active_record_union" gem "activerecord-import" -gem "bootstrap", "~> 4.3.1" +gem "active_record_union" +gem "bootstrap", "~> 4.5.0" +gem "bootstrap_form", "~> 4.0" gem "cancancan" gem "composite_primary_keys", "~> 12.0.0" gem "config" gem "delayed_job_active_record" -gem "dynamic_form" -gem "http_accept_language", "~> 2.0.0" +gem "http_accept_language", "~> 2.1.1" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" -gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" +gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry" gem "rack-cors" -gem "rails-i18n", "~> 4.0.0" +gem "rails-i18n", "~> 6.0.0" gem "rinku", ">= 2.0.6", :require => "rails_rinku" gem "strong_migrations" gem "validates_email_format_of", ">= 1.5.1" @@ -66,12 +60,13 @@ gem "quad_tile", "~> 1.0.1" gem "rack-uri_sanitizer" # Omniauth for authentication -gem "omniauth" +gem "omniauth", "~> 2.0.2" gem "omniauth-facebook" gem "omniauth-github" gem "omniauth-google-oauth2", ">= 0.6.0" gem "omniauth-mediawiki", ">= 0.0.4" gem "omniauth-openid" +gem "omniauth-rails_csrf_protection", "~> 1.0" gem "omniauth-windowslive" # Markdown formatting support @@ -87,9 +82,6 @@ gem "libxml-ruby", ">= 2.0.5", :require => "libxml" gem "htmlentities" gem "sanitize" -# Load SystemTimer for implementing request timeouts -gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_18 - # Load faraday for mockable HTTP client gem "faraday" @@ -116,7 +108,7 @@ gem "logstasher" gem "bzip2-ffi" gem "ffi-libarchive" gem "gd2-ffij", ">= 0.4.0" -gem "mimemagic" +gem "marcel" # Used for browser detection gem "browser" @@ -132,28 +124,26 @@ group :development do gem "annotate" gem "better_errors" gem "binding_of_caller" + gem "debug_inspector" gem "listen" gem "vendorer" end # Gems needed for running tests group :test do - gem "fakefs", :require => "fakefs/safe" - gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20] + gem "brakeman" + gem "capybara", ">= 2.15" + gem "erb_lint", :require => false + gem "factory_bot_rails" + gem "minitest", "~> 5.1" + gem "puma", "~> 5.0" gem "rails-controller-testing" gem "rubocop" + gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rails" - gem "webmock" -end - -# Needed in development as well so rake can see konacha tasks -group :development, :test do - gem "capybara", ">= 2.15" - gem "coveralls", :require => false - gem "erb_lint", :require => false - gem "factory_bot_rails" - gem "poltergeist" - gem "puma", "~> 3.11" gem "selenium-webdriver" + gem "simplecov", :require => false + gem "simplecov-lcov", :require => false + gem "webmock" end