X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3f6f62b39827e7956c696300dc6fba7137fb9409..a0dd71112a910f68383392bc9efaa26b8e042d3e:/Gemfile diff --git a/Gemfile b/Gemfile index 8869fb37c..ce35201ee 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.3.4" - -# 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.5" # Require json for multi_json gem "json" @@ -67,12 +61,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 @@ -88,9 +83,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" @@ -133,6 +125,7 @@ group :development do gem "annotate" gem "better_errors" gem "binding_of_caller" + gem "debug_inspector", "< 1.0.0" gem "listen" gem "vendorer" end @@ -146,7 +139,7 @@ group :test do gem "minitest", "~> 5.1" gem "puma", "~> 5.0" gem "rails-controller-testing" - gem "rubocop", "~> 0.93" + gem "rubocop" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rails"