Commit Graph

65 Commits

Author SHA1 Message Date
GitLab Bot 43a25d93eb Add latest changes from gitlab-org/gitlab@16-0-stable-ee 2023-05-17 16:05:49 +00:00
GitLab Bot 71786ddc8e Add latest changes from gitlab-org/gitlab@15-9-stable-ee 2023-02-20 13:49:51 +00:00
GitLab Bot ee664acb35 Add latest changes from gitlab-org/gitlab@15-5-stable-ee 2022-10-20 09:40:42 +00:00
GitLab Bot b39512ed75 Add latest changes from gitlab-org/gitlab@15-3-stable-ee 2022-08-18 08:17:02 +00:00
GitLab Bot b595cb0c1d Add latest changes from gitlab-org/gitlab@15-2-stable-ee 2022-07-20 15:40:28 +00:00
GitLab Bot 36a59d088e Add latest changes from gitlab-org/gitlab@15-0-stable-ee 2022-05-19 07:33:21 +00:00
GitLab Bot a7b3560714 Add latest changes from gitlab-org/gitlab@14-8-stable-ee 2022-02-18 09:45:46 +00:00
GitLab Bot aee0a117a8 Add latest changes from gitlab-org/gitlab@14-6-stable-ee 2021-12-20 13:37:47 +00:00
GitLab Bot 311b0269b4 Add latest changes from gitlab-org/gitlab@14-5-stable-ee 2021-11-18 13:16:36 +00:00
GitLab Bot d9ab72d608 Add latest changes from gitlab-org/gitlab@14-4-stable-ee 2021-10-20 08:43:02 +00:00
GitLab Bot 0653e08efd Add latest changes from gitlab-org/gitlab@14-3-stable-ee 2021-09-20 13:18:24 +00:00
GitLab Bot b76ae63846 Add latest changes from gitlab-org/gitlab@14-2-stable-ee 2021-08-19 09:08:42 +00:00
GitLab Bot e8d2c25793 Add latest changes from gitlab-org/gitlab@14-1-stable-ee 2021-07-20 09:55:51 +00:00
GitLab Bot f64a639bcf Add latest changes from gitlab-org/gitlab@13-10-stable-ee 2021-03-16 18:18:33 +00:00
GitLab Bot 859a6fb938 Add latest changes from gitlab-org/gitlab@13-9-stable-ee 2021-02-18 10:34:06 +00:00
Robert Speicher 6438df3a1e
Add latest changes from gitlab-org/gitlab@13-8-stable-ee 2021-01-20 13:34:23 -06:00
GitLab Bot 8b573c9489 Add latest changes from gitlab-org/gitlab@13-7-stable-ee 2020-12-17 11:59:07 +00:00
GitLab Bot 7e9c479f7d Add latest changes from gitlab-org/gitlab@13-6-stable-ee 2020-11-19 08:27:35 +00:00
GitLab Bot 48aff82709 Add latest changes from gitlab-org/gitlab@13-5-stable-ee 2020-10-21 07:08:36 +00:00
GitLab Bot a09983ae35 Add latest changes from gitlab-org/gitlab@13-2-stable-ee 2020-07-20 12:26:25 +00:00
GitLab Bot 9f46488805 Add latest changes from gitlab-org/gitlab@13-0-stable-ee 2020-05-20 14:34:42 +00:00
GitLab Bot f3b1e07903 Add latest changes from gitlab-org/gitlab@master 2020-04-06 15:10:04 +00:00
GitLab Bot be2f4c5788 Add latest changes from gitlab-org/gitlab@master 2020-03-24 03:09:28 +00:00
GitLab Bot 1ce6af4aad Add latest changes from gitlab-org/gitlab@master 2020-01-24 00:08:51 +00:00
GitLab Bot e0ab7eda1b Add latest changes from gitlab-org/gitlab@master 2020-01-20 18:08:44 +00:00
GitLab Bot 7480d774df Add latest changes from gitlab-org/gitlab@master 2019-12-17 00:07:59 +00:00
GitLab Bot 556c79d6cc Add latest changes from gitlab-org/gitlab@master 2019-12-02 15:06:36 +00:00
Marcel Amirault 78d09e3ef3 Start linting for unneeded dollar signs
Do not use dollar signs in shell codeblocks when
no output is shown
2019-09-10 10:15:43 +00:00
Marcel Amirault 72a9162230 Update capitalization in /integrations and /raketasks
Also updates redirect text in /project-services
2019-08-27 08:41:50 +00:00
Marcel Amirault 33c867b70d Fix whitespace in install and integration docs
Many code blocks are 4spaced, and they render in GitLab
without coloring as a result, even though they are
fenced with a language label. If in a list, other items
will render as being in a code block too, even if not
meant to. This fixes all these issues, and cleans up
minor white space issues in install and integration docs
2019-07-11 15:21:26 +00:00
Wei-Meng Lee 8835bdad1d Revert "Merge branch 'patch-43' into 'master'"
This reverts merge request !25195
2019-06-06 00:24:56 +00:00
Mike Lewis aa4d99cf8f Update GitHub integration instructions to swap example domain to *.example.com (github.md) 2019-05-01 23:13:12 +00:00
Evan Read 47fb1c5235 Remove consecutive blank lines from markdown files
For the sake of consistency, removes any extraneous
consecutive blank lines from the doc suite.
2019-02-18 09:36:13 +00:00
Dennis Jekubczyk d219fbb95f Fix callback url 2019-02-13 12:49:38 +00:00
Stan Hu 88f2e9615c
Alias GitHub and BitBucket OAuth2 callback URLs
To prevent an OAuth2 covert redirect vulnerability, this commit adds and
uses an alias for the GitHub and BitBucket OAuth2 callback URLs to the
following paths:

GitHub: /users/auth/-/import/github
Bitbucket: /users/auth/-/import/bitbucket

This allows admins to put a more restrictive callback URL in the OAuth2
configuration settings. Instead of https://example.com, admins can now use:

https://example.com/users/auth

It's possible but not trivial to change Devise and OmniAuth to use a
different prefix for callback URLs instead of /users/auth. For now,
aliasing the import URLs under the /users/auth namespace should suffice.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56663
2019-01-31 16:52:48 +01:00
Takuya Noguchi 5883c4c4b2 Update GitHub integration docs to mainly follow GitHub updates.
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-01 12:47:37 +09:00
Marcel Amirault fd7358a8cd Correct Gitlab to GitLab in docs 2018-09-25 04:57:57 +00:00
Achilleas Pipinellis 8197c756b1
Copyedit GitHub importer docs 2018-06-04 12:15:42 +02:00
Achilleas Pipinellis f900204ade
Correct another one github.example.com
[ci skip]
2018-04-12 10:34:05 +02:00
Xiaogang Wen fca03376bd
Update github.md on GHE URL 2018-04-12 10:33:57 +02:00
Cindy Pallares c13e093334 Add extra step in GHE import docs 2017-05-23 18:29:20 -05:00
Cindy Pallares 🦉 45e3658d05 Add docs on how to turn off SSL verification on GH oauth
In https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/323/ we added support
to disable SSL verification because attempting to import projects from a
self-signed GH Enterprise instance will fail with an SSL error.
2017-05-18 16:08:56 -05:00
Xiaogang Wen 4cbe05e802 Patch 15 2017-03-14 09:09:56 +00:00
Achilleas Pipinellis 1352a80f90 Fix markdown link in Omniauth docs
[ci skip]
2017-02-09 08:55:09 +01:00
Achilleas Pipinellis ad85eccc18 Mention reconfigure/restart in omniauth docs
[ci skip]
2017-02-09 08:38:25 +01:00
Florian cfde451d36 Update github.md 2016-10-21 14:57:15 +02:00
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
Eric K Idema ae2d4d2de0 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 rendered on doc.gitlab.com because
pandoc does not escape them correctly.
2016-05-12 10:48:34 -04:00
Eric K Idema e921fc90b8 Fix documentation for Github integration authorization callback url.
There are two callbacks that could be used with Github integration:

  * /import/github/callback (used by project import)
  * /users/auth/github/callback (used by OmniAuth)

Github's documentation suggests that authorization callback url should be
set to the longest common path.

https://developer.github.com/v3/oauth/#redirect-urls

Configuring according to the previous documentation resulted in a
redirect_uri_mismatch error from Github when logging in via OmniAuth.
2016-05-10 19:15:26 -04:00
Alex Jordan c50ce3ba29 Fix the GitHub Omniauth instructions 2016-04-28 21:13:21 -07:00