Merge branch 'pull/2486'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 264674fbcb9499de7e137172b51a43ff46001a71..703c68eaa6234599ae8cb7b761301f5c6d93f9bb 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -3,12 +3,6 @@ source "https://rubygems.org"
 # Require rails
 gem "rails", "6.0.3.4"
 
 # Require rails
 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 2.0
-gem "psych", :platforms => :ruby_20
-

 # Require json for multi_json
 gem "json"
 
 # Require json for multi_json
 gem "json"
 


@@ -67,7 +61,7 @@ gem "quad_tile", "~> 1.0.1"
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication

-gem "omniauth"
+gem "omniauth", "~> 1.9.1"

 gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"
 gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"


@@ -130,6 +124,7 @@ group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"

+  gem "debug_inspector", "< 1.0.0"

   gem "listen"
   gem "vendorer"
 end
   gem "listen"
   gem "vendorer"
 end


@@ -143,7 +138,7 @@ group :test do
   gem "minitest", "~> 5.1"
   gem "puma", "~> 5.0"
   gem "rails-controller-testing"
   gem "minitest", "~> 5.1"
   gem "puma", "~> 5.0"
   gem "rails-controller-testing"

-  gem "rubocop", "~> 0.93"
+  gem "rubocop"

   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"