X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2b962023e39785a8388b5666974bdffba14f57d4..d7eac9b5a8f4cbbeb4ed3d73464993bfd5888935:/Gemfile diff --git a/Gemfile b/Gemfile index 1cd0edca7..ce35201ee 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.3.2" - -# 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" @@ -41,9 +35,10 @@ gem "image_optim_rails" # Load rails plugins gem "actionpack-page_caching", ">= 1.2.0" -gem "active_record_union" gem "activerecord-import" +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" @@ -66,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 @@ -87,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" @@ -132,23 +125,26 @@ group :development do gem "annotate" gem "better_errors" gem "binding_of_caller" + gem "debug_inspector", "< 1.0.0" gem "listen" gem "vendorer" end # Gems needed for running tests group :test do + gem "brakeman" gem "capybara", ">= 2.15" - gem "coveralls", :require => false gem "erb_lint", :require => false gem "factory_bot_rails" gem "minitest", "~> 5.1" - gem "puma", "~> 4.3" + gem "puma", "~> 5.0" gem "rails-controller-testing" gem "rubocop" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rails" gem "selenium-webdriver" + gem "simplecov", :require => false + gem "simplecov-lcov", :require => false gem "webmock" end