Merge branch 'ce-upstream' into 'master'
CE upstream Closes gitlab-ce#26813 and gitlab-ce#25989 See merge request !1102
Showing
... | @@ -21,7 +21,7 @@ gem 'rugged', '~> 0.24.0' | ... | @@ -21,7 +21,7 @@ gem 'rugged', '~> 0.24.0' |
# Authentication libraries | # Authentication libraries | ||
gem 'devise', '~> 4.2' | gem 'devise', '~> 4.2' | ||
gem 'doorkeeper', '~> 4.2.0' | gem 'doorkeeper', '~> 4.2.0' | ||
gem 'omniauth', '~> 1.3.1' | gem 'omniauth', '~> 1.3.2' | ||
gem 'omniauth-auth0', '~> 1.4.1' | gem 'omniauth-auth0', '~> 1.4.1' | ||
gem 'omniauth-azure-oauth2', '~> 0.0.6' | gem 'omniauth-azure-oauth2', '~> 0.0.6' | ||
gem 'omniauth-cas3', '~> 1.1.2' | gem 'omniauth-cas3', '~> 1.1.2' | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment