diff --git a/Gemfile b/Gemfile index 1feccb929..27b6695d0 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ source 'https://rubygems.org' # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. gemspec +gem 'omniauth', '~> 1.9' # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile index df4846b8c..9b0ba39a7 100644 --- a/gemfiles/rails_4_2.gemfile +++ b/gemfiles/rails_4_2.gemfile @@ -2,6 +2,7 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 4.2" gem "sqlite3", "~> 1.3.6" gem "mysql2", "~> 0.4.10" @@ -9,12 +10,12 @@ gem "pg", "~> 0.21" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -27,7 +28,7 @@ group :development, :test do gem "minitest-rails" gem "minitest-reporters" gem "mocha", ">= 1.5" - gem "pry", "< 0.13" + gem "pry" gem "pry-byebug" gem "pry-remote" gem "rubocop", require: false @@ -35,7 +36,7 @@ end group :test do gem "rails-controller-testing" - gem "simplecov", "< 0.18", require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_4_2_mongoid_5.gemfile b/gemfiles/rails_4_2_mongoid_5.gemfile index 083bba80b..ed9859e14 100644 --- a/gemfiles/rails_4_2_mongoid_5.gemfile +++ b/gemfiles/rails_4_2_mongoid_5.gemfile @@ -2,19 +2,19 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 4.2" gem "mongoid", "~> 5.4" gem "mongoid-locker", "~> 1.0" group :development, :test do gem "attr_encrypted" - gem "byebug", "< 11.1" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -27,7 +27,7 @@ group :development, :test do gem "minitest-rails" gem "minitest-reporters" gem "mocha", ">= 1.5" - gem "pry", "< 0.13" + gem "pry" gem "pry-byebug" gem "pry-remote" gem "rubocop", require: false @@ -35,7 +35,7 @@ end group :test do gem "rails-controller-testing" - gem "simplecov", "< 0.18", require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile index 4f009a808..f19f8cddb 100644 --- a/gemfiles/rails_5_0.gemfile +++ b/gemfiles/rails_5_0.gemfile @@ -2,6 +2,7 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 5.0" gem "sqlite3", "~> 1.3.6" gem "mysql2" @@ -9,12 +10,12 @@ gem "pg" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -27,7 +28,7 @@ group :development, :test do gem "minitest-rails" gem "minitest-reporters" gem "mocha", ">= 1.5" - gem "pry", "< 0.13" + gem "pry" gem "pry-byebug" gem "pry-remote" gem "rubocop", require: false @@ -35,7 +36,7 @@ end group :test do gem "rails-controller-testing" - gem "simplecov", "< 0.18", require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile index c8fb85550..5e3856e4c 100644 --- a/gemfiles/rails_5_1.gemfile +++ b/gemfiles/rails_5_1.gemfile @@ -2,6 +2,7 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 5.1" gem "sqlite3", "~> 1.3.6" gem "mysql2" @@ -9,12 +10,12 @@ gem "pg" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -27,7 +28,7 @@ group :development, :test do gem "minitest-rails" gem "minitest-reporters" gem "mocha", ">= 1.5" - gem "pry", "< 0.13" + gem "pry" gem "pry-byebug" gem "pry-remote" gem "rubocop", require: false @@ -35,11 +36,7 @@ end group :test do gem "rails-controller-testing" - - # Workaround for cc-test-reporter with SimpleCov 0.18. - # Stop upgrading SimpleCov until the following issue will be resolved. - # https://github.com/codeclimate/test-reporter/issues/418 - gem 'simplecov', '~> 0.10', '< 0.18', require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_5_1_mongoid_6.gemfile b/gemfiles/rails_5_1_mongoid_6.gemfile index b875adf55..b6b8a50d0 100644 --- a/gemfiles/rails_5_1_mongoid_6.gemfile +++ b/gemfiles/rails_5_1_mongoid_6.gemfile @@ -2,19 +2,19 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 5.1" gem "mongoid", "~> 6.4" gem "mongoid-locker", "~> 1.0" group :development, :test do gem "attr_encrypted" - gem "byebug", "< 11.1" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -27,7 +27,7 @@ group :development, :test do gem "minitest-rails" gem "minitest-reporters" gem "mocha", ">= 1.5" - gem "pry", "< 0.13" + gem "pry" gem "pry-byebug" gem "pry-remote" gem "rubocop", require: false @@ -35,7 +35,7 @@ end group :test do gem "rails-controller-testing" - gem "simplecov", "< 0.18", require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_5_1_mongoid_7.gemfile b/gemfiles/rails_5_1_mongoid_7.gemfile index 193f9649a..44e6ed031 100644 --- a/gemfiles/rails_5_1_mongoid_7.gemfile +++ b/gemfiles/rails_5_1_mongoid_7.gemfile @@ -2,18 +2,19 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 5.1" gem "mongoid", "~> 7.0" gem "mongoid-locker", "~> 1.0" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -34,11 +35,7 @@ end group :test do gem "rails-controller-testing" - - # Workaround for cc-test-reporter with SimpleCov 0.18. - # Stop upgrading SimpleCov until the following issue will be resolved. - # https://github.com/codeclimate/test-reporter/issues/418 - gem 'simplecov', '~> 0.10', '< 0.18', require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 791f8825b..cfa81a8f2 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -2,6 +2,7 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 5.2" gem "sqlite3", "~> 1.3.6" gem "mysql2" @@ -9,12 +10,12 @@ gem "pg" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -27,7 +28,7 @@ group :development, :test do gem "minitest-rails" gem "minitest-reporters" gem "mocha", ">= 1.5" - gem "pry", "< 0.13" + gem "pry" gem "pry-byebug" gem "pry-remote" gem "rubocop", require: false @@ -35,7 +36,7 @@ end group :test do gem "rails-controller-testing" - gem "simplecov", "< 0.18", require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_5_2_mongoid_6.gemfile b/gemfiles/rails_5_2_mongoid_6.gemfile index 13cc0599c..e6c0814e8 100644 --- a/gemfiles/rails_5_2_mongoid_6.gemfile +++ b/gemfiles/rails_5_2_mongoid_6.gemfile @@ -2,18 +2,19 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 5.2" gem "mongoid", "~> 6.4" gem "mongoid-locker", "~> 1.0" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -34,7 +35,7 @@ end group :test do gem "rails-controller-testing" - gem "simplecov", "< 0.18", require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_5_2_mongoid_7.gemfile b/gemfiles/rails_5_2_mongoid_7.gemfile index 261ace014..a9ff47640 100644 --- a/gemfiles/rails_5_2_mongoid_7.gemfile +++ b/gemfiles/rails_5_2_mongoid_7.gemfile @@ -2,18 +2,19 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 5.2" gem "mongoid", "~> 7.0" gem "mongoid-locker", "~> 1.0" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" - gem 'omniauth-apple' - gem "rack-cors", require: "rack/cors" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" + gem "omniauth-apple" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -34,7 +35,7 @@ end group :test do gem "rails-controller-testing" - gem "simplecov", "< 0.18", require: false + gem "simplecov", require: false end group :development do diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile index 2a3ec791c..65e6965bd 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0.gemfile @@ -2,6 +2,7 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 6.0" gem "sqlite3", "~> 1.4.1" gem "mysql2" @@ -9,10 +10,10 @@ gem "pg" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" gem 'omniauth-apple' gem "rack-cors", require: "rack/cors" gem "thor" diff --git a/gemfiles/rails_6_0_mongoid_7.gemfile b/gemfiles/rails_6_0_mongoid_7.gemfile index 8b6bbca87..1ec93175a 100644 --- a/gemfiles/rails_6_0_mongoid_7.gemfile +++ b/gemfiles/rails_6_0_mongoid_7.gemfile @@ -2,18 +2,19 @@ source "https://rubygems.org" +gem "omniauth", "~> 1.9" gem "rails", "~> 6.0" gem "mongoid", "~> 7.0" gem "mongoid-locker", "~> 1.0" group :development, :test do gem "attr_encrypted" - gem "figaro", git: "https://github.com/laserlemon/figaro" - gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook" - gem "omniauth-github", git: "https://github.com/intridea/omniauth-github" - gem "omniauth-google-oauth2", git: "https://github.com/zquestz/omniauth-google-oauth2" + gem "figaro" + gem "omniauth-facebook" + gem "omniauth-github" + gem "omniauth-google-oauth2" gem "omniauth-apple" - gem "rack-cors", require: "rack/cors" + gem "rack-cors" gem "thor" gem "database_cleaner" gem "factory_bot_rails" @@ -34,7 +35,7 @@ end group :test do gem "rails-controller-testing" - gem "simplecov", "< 0.18", require: false + gem "simplecov", require: false end group :development do