Download as
Browse Code »

Commit 5d6e9ea8efa07d5342857de0772b59a4c5092f60

Authored by Dmitriy Zaporozhets
2 parents e7f80806 5b018cc5
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'link-to-github-app' into 'master' 

Link to github app
Showing 3 changed files with 13 additions and 13 deletions   Show diff stats
doc/integration/README.md
  Diff comments   View file @5d6e9ea
1 1 + [External issue tracker](external-issue-tracker.md)
2 2 + [LDAP](ldap.md)
3   -+ [Twitter](twitter.md)
  3 ++ [oAuth](twitter.md) Login with Twitter, GitHub, etc.
... ...
doc/integration/oauth.md 0 → 100644
  Diff comments   View file @5d6e9ea
... ... @@ -0,0 +1,12 @@
  1 +You can use other services to log into GitLab via oAuth.
  2 +
  3 +Please configure this in gitlab.yml
  4 +
  5 +Below are screenshots how to setup your app on Twitter for this:
  6 +
  7 +![Application details](twitter_app_details.png)
  8 +![API Keys](twitter_app_api_keys.png)
  9 +
  10 +And GitHub:
  11 +
  12 +![GitHub app](github_app.png)
... ...
doc/integration/twitter_oauth.md
View file @e7f8080
... ... @@ -1,12 +0,0 @@
1   -You can use Twitter to log into GitLab.
2   -
3   -Please configure this in gitlab.yml
4   -
5   -Below are screenshots how to setup your app on Twitter for this:
6   -
7   -![Application details](twitter_app_details.png)
8   -![API Keys](twitter_app_api_keys.png)
9   -
10   -And GitHub:
11   -
12   -![GitHub app](github_app.png)