Commit graph

25 commits

Author SHA1 Message Date
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
Stan Hu
c47183d787 Fixes for review of GitHub Enterprise backport changes 2016-04-26 21:02:45 -07:00
Stan Hu
eede032345 Backport GitHub Enterprise import support from EE
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
2016-04-26 21:00:55 -07:00
Achilleas Pipinellis
bf7aac74a4 Merge pull request #9978 from fantasywind/patch-2
Update github.md
2016-03-28 20:40:59 +03:00
Chia Yu Pai
da866795ed Update github default callback url 2016-03-01 18:30:22 +08:00
Achilleas Pipinellis
6f615500a9 Move all integration docs images in a single directory
[ci skip]
2016-01-24 21:22:19 +01:00
Chia Yu Pai
a97c51580e Update github.md
add default callback URL path
2016-01-15 14:22:36 +08:00
Tobias Stöckler
900d3a09a7 Fix typos in integration docs 2015-12-07 10:28:47 +01:00
Kuo-Cheng Yeu
fc64b3f7b7 remove duplicate right braces ('}') in configuration examples of GitHub,
GitLab, and Google.
2015-03-09 23:20:44 +08:00
Douwe Maan
20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Dmitriy Zaporozhets
a3d039259e Fix broken links in documentation 2015-02-18 22:07:09 -08:00
Marin Jankovski
d76c5824bc Update oauth documenatation with examples for omnibus package and installations from source. 2015-02-13 14:49:19 -08:00
Valery Sizov
d5ae521cf7 update documentation regarding github_importer 2015-01-19 12:55:44 -08:00
Robert Schilling
abdc442648 Fix spelling errors in doc, closes #7437
Further changes
2014-08-07 10:27:54 +02:00
Ciro Santilli
fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Drew Blessing
728b05cab7 Add OmniAuth Documentation
Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Add OmniAuth Documentation

Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Use omniauth again

Remove notice

Restore whitespace

Slight changes
2014-04-10 07:31:54 -05:00