diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-04-26 21:02:24 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-04-26 21:02:45 -0700 |
| commit | c47183d78723a30733dc465f72e37299d8628363 (patch) | |
| tree | 204e90db22269783a7685aac9b38501414150ca6 /config/initializers | |
| parent | eede0323453190440a8d738b5eab0723f54dee65 (diff) | |
| download | gitlab-ce-c47183d78723a30733dc465f72e37299d8628363.tar.gz | |
Fixes for review of GitHub Enterprise backport changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 39641655181..6eb144d043b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -143,7 +143,7 @@ Settings.omniauth.session_tickets['cas3'] = 'ticket' # Fill out omniauth-gitlab settings. It is needed for easy set up GHE or GH by just specifying url. github_default_url = "https://github.com" -github_settings = Settings.omniauth['providers'].find { |provider| provider["name"] == "github"} +github_settings = Settings.omniauth['providers'].find { |provider| provider["name"] == "github" } if github_settings # For compatibility with old config files (before 7.8) @@ -158,9 +158,9 @@ if github_settings github_settings["args"]["client_options"] = OmniAuth::Strategies::GitHub.default_options[:client_options] else github_settings["args"]["client_options"] = { - "site" => File.join(github_settings["url"], "api/v3"), + "site" => File.join(github_settings["url"], "api/v3"), "authorize_url" => File.join(github_settings["url"], "login/oauth/authorize"), - "token_url" => File.join(github_settings["url"], "login/oauth/access_token") + "token_url" => File.join(github_settings["url"], "login/oauth/access_token") } end end |