diff options
author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-04-25 02:48:22 +0400 |
---|---|---|
committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-06-04 01:16:31 +0400 |
commit | fd348de76d651d49acc8eb742cc647dc777ef5fc (patch) | |
tree | 26f42bef57c9a636eff0a548a29cb1e2e6d12c8c /doc/integration/github.md | |
parent | de1a7aa7eb523cf2fdad12f8eeda2ba4c5b51820 (diff) |
Update docs to markdown style guide.
Diffstat (limited to 'doc/integration/github.md')
-rw-r--r-- | doc/integration/github.md | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md index 672536b4daf..b53a7c12857 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -2,18 +2,24 @@ To enable the GitHub OmniAuth provider you must register your application with GitHub. GitHub will generate a client ID and secret key for you to use. -1. Sign in to GitHub. -2. Navigate to your individual user settings or an organization's settings, depending on how you want the application registered. It does not matter if the application is registered as an individual or an organization - that is entirely up to you. -3. Select "Applications" in the left menu. -4. Select "Register new application". -5. Provide the required details. - * Application name: This can be anything. Consider something like "\<Organization\>'s GitLab" or "\<Your Name\>'s GitLab" or something else descriptive. - * Homepage URL: The URL to your GitLab installation. 'https://gitlab.company.com' - * Application description: Fill this in if you wish. - * Authorization callback URL: 'https://gitlab.company.com/users/auth/github/callback' -6. Select "Register application". -7. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. ![GitHub app](github_app.png) -8. On your GitLab server, open the configuration file. +1. Sign in to GitHub. + +1. Navigate to your individual user settings or an organization's settings, depending on how you want the application registered. It does not matter if the application is registered as an individual or an organization - that is entirely up to you. + +1. Select "Applications" in the left menu. + +1. Select "Register new application". + +1. Provide the required details. + - Application name: This can be anything. Consider something like "\<Organization\>'s GitLab" or "\<Your Name\>'s GitLab" or something else descriptive. + - Homepage URL: The URL to your GitLab installation. 'https://gitlab.company.com' + - Application description: Fill this in if you wish. + - Authorization callback URL: 'https://gitlab.company.com/users/auth/github/callback' +1. Select "Register application". + +1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. ![GitHub app](github_app.png) + +1. On your GitLab server, open the configuration file. ```sh cd /home/git/gitlab @@ -21,8 +27,9 @@ To enable the GitHub OmniAuth provider you must register your application with G sudo -u git -H editor config/gitlab.yml ``` -9. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for more details. -10. Under `providers:` uncomment (or add) lines that look like the following: +1. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for more details. + +1. Under `providers:` uncomment (or add) lines that look like the following: ``` - { name: 'github', app_id: 'YOUR APP ID', @@ -30,9 +37,12 @@ To enable the GitHub OmniAuth provider you must register your application with G args: { scope: 'user:email' } } ``` -11. Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7. -12. Change 'YOUR APP SECRET' to the client secret from the GitHub application page from step 7. -13. Save the configuration file. -14. Restart GitLab for the changes to take effect. +1. Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7. + +1. Change 'YOUR APP SECRET' to the client secret from the GitHub application page from step 7. + +1. Save the configuration file. + +1. Restart GitLab for the changes to take effect. On the sign in page there should now be a GitHub icon below the regular sign in form. Click the icon to begin the authentication process. GitHub will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in. |