Fix unexpected spacing on note buttons when overflowed

[rails.git] / Gemfile

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

-gem "rails", "6.0.3.3"
-
-# 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.4"

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


@@ -67,12 +61,13 @@ gem "quad_tile", "~> 1.0.1"
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
 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-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
 gem "omniauth-windowslive"
 
 # Markdown formatting support


@@ -88,9 +83,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"
 


@@ -133,6 +125,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


@@ -141,7 +134,6 @@ 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 "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"


@@ -152,5 +144,7 @@ group :test do
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "selenium-webdriver"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "selenium-webdriver"

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

   gem "webmock"
 end
   gem "webmock"
 end