X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/801522c5c349cee50c917a933bcd39656c8dc230..62637645bf30bb79d5ab7ef372439b836cceb76c:/Gemfile diff --git a/Gemfile b/Gemfile index d60f1ba94..f75921f12 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "5.2.0" +gem "rails", "5.2.2" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -45,7 +45,9 @@ gem "image_optim_rails" # Load rails plugins gem "actionpack-page_caching" -gem "composite_primary_keys", "~> 11.0.0" +gem "active_record_union" +gem "cancancan" +gem "composite_primary_keys", "~> 11.1.0" gem "delayed_job_active_record" gem "dynamic_form" gem "http_accept_language", "~> 2.0.0" @@ -69,8 +71,8 @@ gem "rack-uri_sanitizer" gem "omniauth" gem "omniauth-facebook" gem "omniauth-github" -gem "omniauth-google-oauth2", ">= 0.2.7" -gem "omniauth-mediawiki", ">= 0.0.3" +gem "omniauth-google-oauth2", ">= 0.6.0" +gem "omniauth-mediawiki", ">= 0.0.4" gem "omniauth-openid" gem "omniauth-windowslive"