diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-07-17 16:17:04 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-07-17 16:24:19 -0700 |
| commit | 5f4dcbf8be36e7c87afdc28afd7f2d663a9abf28 (patch) | |
| tree | 8e3e6de2954817f8b5ceaecd684e6e4bdfbe565d | |
| parent | a84ed6eb234c9a9f0e5e5c0deea1779d224764a8 (diff) | |
| download | gitlab-ce-5f4dcbf8be36e7c87afdc28afd7f2d663a9abf28.tar.gz | |
Set OmniAuth full_host parameter to ensure redirect URIs are correct
Closes #1967
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/7_omniauth.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 001d5350bad..38c56e91e1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.0 (unreleased) + - Set OmniAuth full_host parameter to ensure redirect URIs are correct (Stan Hu) - Expire Rails cache entries after two weeks to prevent endless Redis growth - Add support for destroying project milestones (Stan Hu) diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb index df73ec1304a..7f73546ac89 100644 --- a/config/initializers/7_omniauth.rb +++ b/config/initializers/7_omniauth.rb @@ -11,6 +11,7 @@ if Gitlab::LDAP::Config.enabled? end end +OmniAuth.config.full_host = Settings.gitlab['url'] OmniAuth.config.allowed_request_methods = [:post] #In case of auto sign-in, the GET method is used (users don't get to click on a button) OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present? |