summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-08 10:32:00 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-08 10:32:00 +0300
commit3b339a8b040b1c12469a2eb1ed05bdc3b2aa9af4 (patch)
treed284fa2db3e208853a82659b512f321fbee32c7e /doc
parent1e8ed9d51454df4d18ace7c89d41d79121135743 (diff)
downloadgitlab-ce-3b339a8b040b1c12469a2eb1ed05bdc3b2aa9af4.tar.gz
More info about GitLab integrations with OAuth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/google_app.pngbin0 -> 52669 bytes
-rw-r--r--doc/integration/oauth.md47
-rw-r--r--doc/integration/twitter_app_details.pngbin106979 -> 121621 bytes
3 files changed, 45 insertions, 2 deletions
diff --git a/doc/integration/google_app.png b/doc/integration/google_app.png
new file mode 100644
index 00000000000..5a62ad35009
--- /dev/null
+++ b/doc/integration/google_app.png
Binary files differ
diff --git a/doc/integration/oauth.md b/doc/integration/oauth.md
index bdbf99b4174..904c9157a04 100644
--- a/doc/integration/oauth.md
+++ b/doc/integration/oauth.md
@@ -1,12 +1,55 @@
+# OAuth
+
You can use other services to log into GitLab via oAuth.
-Please configure this in gitlab.yml
+For this you need:
+
+* create app in selected services
+* configure gitlab.yml
+
+## Twitter:
Below are screenshots how to setup your app on Twitter for this:
![Application details](twitter_app_details.png)
![API Keys](twitter_app_api_keys.png)
-And GitHub:
+## GitHub:
![GitHub app](github_app.png)
+
+## Google:
+
+![Google app](google_app.png)
+
+
+## GitLab config file
+
+Second step is to modify gitlab.yml with app credentials:
+
+```
+production:
+ ...
+
+ omniauth:
+ enabled: true
+
+ providers:
+ - {
+ name: 'twitter',
+ app_id: 'XXXXXXXX',
+ app_secret: 'XXXXXXXXXXXXXXXXXXXXXXXX'
+ }
+ - {
+ name: 'google_oauth2',
+ app_id: 'XXXXXXXXXXX.apps.googleusercontent.com',
+ app_secret: 'XXXXXXXX'
+ }
+ - {
+ name: 'github',
+ app_id: 'XXXXXXXXXX',
+ app_secret: 'XXXXXXXXXXXXXXXXXXXXXXXX'
+ }
+
+```
+
diff --git a/doc/integration/twitter_app_details.png b/doc/integration/twitter_app_details.png
index a4cb269df52..b95e8af8a74 100644
--- a/doc/integration/twitter_app_details.png
+++ b/doc/integration/twitter_app_details.png
Binary files differ