X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/efd50cd529990069dc1ca95f66ec6f61471fe29d..c4a192f43692964fbc4c20c67930f16393a18028:/Gemfile diff --git a/Gemfile b/Gemfile index 05bfc6cbd..fa1bed468 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,8 +45,9 @@ gem "image_optim_rails" # Load rails plugins gem "actionpack-page_caching" +gem "active_record_union" gem "cancancan" -gem "composite_primary_keys", "~> 11.0.0" +gem "composite_primary_keys", "~> 11.1.0" gem "delayed_job_active_record" gem "dynamic_form" gem "http_accept_language", "~> 2.0.0" @@ -70,13 +71,13 @@ 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" # Markdown formatting support -gem "redcarpet" +gem "kramdown" # For status transitions of Issues gem "aasm" @@ -113,6 +114,9 @@ gem "canonical-rails" # Used to generate logstash friendly log files gem "logstasher" +# Used to generate images for traces +gem "gd2-ffij" + # Gems useful for development group :development do gem "annotate" @@ -124,6 +128,7 @@ end # Gems needed for running tests group :test do + gem "fakefs", :require => "fakefs/safe" gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20] gem "rails-controller-testing" gem "rubocop"