Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix omniauth version until devise fixes omniauth requirement #1463

Merged
merged 1 commit into from
Mar 6, 2021
Merged

Fix omniauth version until devise fixes omniauth requirement #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 9 additions & 8 deletions gemfiles/rails_4_2.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@

source "https://rubygems.org"

gem "omniauth", "~> 1.9"
gem "rails", "~> 4.2"
gem "sqlite3", "~> 1.3.6"
gem "mysql2", "~> 0.4.10"
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"
Expand All @@ -27,15 +28,15 @@ 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
end

group :test do
gem "rails-controller-testing"
gem "simplecov", "< 0.18", require: false
gem "simplecov", require: false
end

group :development do
Expand Down
18 changes: 9 additions & 9 deletions gemfiles/rails_4_2_mongoid_5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -27,15 +27,15 @@ 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
end

group :test do
gem "rails-controller-testing"
gem "simplecov", "< 0.18", require: false
gem "simplecov", require: false
end

group :development do
Expand Down
17 changes: 9 additions & 8 deletions gemfiles/rails_5_0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@

source "https://rubygems.org"

gem "omniauth", "~> 1.9"
gem "rails", "~> 5.0"
gem "sqlite3", "~> 1.3.6"
gem "mysql2"
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"
Expand All @@ -27,15 +28,15 @@ 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
end

group :test do
gem "rails-controller-testing"
gem "simplecov", "< 0.18", require: false
gem "simplecov", require: false
end

group :development do
Expand Down
21 changes: 9 additions & 12 deletions gemfiles/rails_5_1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@

source "https://rubygems.org"

gem "omniauth", "~> 1.9"
gem "rails", "~> 5.1"
gem "sqlite3", "~> 1.3.6"
gem "mysql2"
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"
Expand All @@ -27,19 +28,15 @@ 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
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
Expand Down
18 changes: 9 additions & 9 deletions gemfiles/rails_5_1_mongoid_6.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -27,15 +27,15 @@ 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
end

group :test do
gem "rails-controller-testing"
gem "simplecov", "< 0.18", require: false
gem "simplecov", require: false
end

group :development do
Expand Down
19 changes: 8 additions & 11 deletions gemfiles/rails_5_1_mongoid_7.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
17 changes: 9 additions & 8 deletions gemfiles/rails_5_2.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@

source "https://rubygems.org"

gem "omniauth", "~> 1.9"
gem "rails", "~> 5.2"
gem "sqlite3", "~> 1.3.6"
gem "mysql2"
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"
Expand All @@ -27,15 +28,15 @@ 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
end

group :test do
gem "rails-controller-testing"
gem "simplecov", "< 0.18", require: false
gem "simplecov", require: false
end

group :development do
Expand Down
15 changes: 8 additions & 7 deletions gemfiles/rails_5_2_mongoid_6.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
15 changes: 8 additions & 7 deletions gemfiles/rails_5_2_mongoid_7.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
Loading