kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixes for review of GitHub Enterprise backport changes

This commit is contained in:
Stan Hu 2016-04-26 21:02:24 -07:00
parent eede032345
commit c47183d787
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/1_settings.rb
View File

@ -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)

2
doc/integration/github.md
View File

@ -78,7 +78,7 @@ GitHub will generate an application ID and secret key for you to use.
args: { scope: 'user:email' } }
```
__Replace `https://github.example.com/` with your GitHub URL__
__Replace `https://github.example.com/` with your GitHub URL.__
1. Change 'YOUR_APP_ID' to the client ID from the GitHub application page from step 7.