X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/004a369a42ea075a10f0634d1c061dd1a13b4cc3..143a90fcac756299ce92e7cfee3846f7dca0ab80:/Gemfile diff --git a/Gemfile b/Gemfile index 94820abeb..7e9be257b 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.6" # 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 @@ -114,7 +109,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"