kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss

Achilleas Pipinellis b50e8c2934 Merge branch 'fix-angle-brackets-in-docs' into 'master'

Fix escaped angle bracket's in integration documentation.

There are several escaped angle brackets in our integration docs.  While these
render fine within GitLab, they are broken when rendered on doc.gitlab.com because
pandoc does not escape them correctly.

You can see the problem here: http://doc.gitlab.com/ce/integration/github.html

Note that the strings `<Organization>` and `<Your Name>` are being interpreted as html tags.

It looks like doc.gitlab.com is using pandoc: https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/generate.rb#L64

You can verify these changes by running something like this and then inspecting `test.html`:

    pandoc --from markdown_github-hard_line_breaks -o test.html doc/integration/twitter.md

You can also verify that GitLab continues to render the docs correctly by checking, for example, http://localhost:3000/help/integration/twitter.md


See merge request !4128

2016-08-10 14:14:36 +00:00

3.1 KiB

Raw Blame History

Integrate your server with GitHub

Import projects from GitHub and login to your GitLab instance with your GitHub account.

To enable the GitHub OmniAuth provider you must register your application with GitHub. GitHub will generate an application ID and secret key for you to use.

Sign in to GitHub.
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.
Select "OAuth applications" in the left menu.
If you already have applications listed, switch to the "Developer applications" tab.
Select "Register new application".
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 is 'http(s)://${YOUR_DOMAIN}'
Select "Register application".
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.

On your GitLab server, open the configuration file.

For omnibus package:

  sudo editor /etc/gitlab/gitlab.rb

For installations from source:

  cd /home/git/gitlab

  sudo -u git -H editor config/gitlab.yml

See Initial OmniAuth Configuration for initial settings.

Add the provider configuration:

For omnibus package:

  gitlab_rails['omniauth_providers'] = [
    {
      "name" => "github",
      "app_id" => "YOUR_APP_ID",
      "app_secret" => "YOUR_APP_SECRET",
      "url" => "https://github.com/",
      "args" => { "scope" => "user:email" }
    }
  ]

For installation from source:

For GitHub.com:

  - { name: 'github', app_id: 'YOUR_APP_ID',
    app_secret: 'YOUR_APP_SECRET',
    args: { scope: 'user:email' } }

For GitHub Enterprise:

  - { name: 'github', app_id: 'YOUR_APP_ID',
    app_secret: 'YOUR_APP_SECRET',
    url: "https://github.example.com/",
    args: { scope: 'user:email' } }

Replace https://github.example.com/ with your GitHub URL.

Change 'YOUR_APP_ID' to the client ID from the GitHub application page from step 7.
Change 'YOUR_APP_SECRET' to the client secret from the GitHub application page from step 7.
Save the configuration file.
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.

3.1 KiB Raw Blame History

Integrate your server with GitHub

3.1 KiB

Raw Blame History