X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/152e3110403c7ac2568298069123e9015d42d8b3..b470e01f840d1b954326f8f863e185ebe7f9b9f2:/Gemfile diff --git a/Gemfile b/Gemfile index 1cd0edca7..264674fbc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.3.2" +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 @@ -41,9 +41,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" @@ -87,9 +88,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" @@ -138,17 +136,19 @@ 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", "~> 0.93" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rails" gem "selenium-webdriver" + gem "simplecov", :require => false + gem "simplecov-lcov", :require => false gem "webmock" end