Remove link_to_if since it's in a clause with the same condition

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 896a840c2a7699937cf8cb88557aaabbfa2700da..264674fbcb9499de7e137172b51a43ff46001a71 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "6.0.3.3"
+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 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -88,9 +88,6 @@ gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 gem "htmlentities"
 gem "sanitize"
 
 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"
 
 # Load faraday for mockable HTTP client
 gem "faraday"
 


@@ -141,16 +138,17 @@ end
 group :test do
   gem "brakeman"
   gem "capybara", ">= 2.15"
 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", "~> 5.0"
   gem "rails-controller-testing"
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
   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 "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "selenium-webdriver"

+  gem "simplecov", :require => false
+  gem "simplecov-lcov", :require => false

   gem "webmock"
 end
   gem "webmock"
 end