Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-02-14 01:49:19 +0300
committerMarin Jankovski <maxlazio@gmail.com>2015-02-14 01:49:19 +0300
commitd76c5824bc05640d276be96f7853f2d266fd6750 (patch)
treec783924f16e6423e5085d0578b6614c7583b987a /doc/integration/twitter.md
parentd0f045eb860f819a736d76622d8d9c546a9610ee (diff)
Update oauth documenatation with examples for omnibus package and installations from source.
Diffstat (limited to 'doc/integration/twitter.md')
-rw-r--r--doc/integration/twitter.md35
1 files changed, 28 insertions, 7 deletions
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index b9e501c5ec1..2d517b2fbc9 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -33,20 +33,41 @@ To enable the Twitter OmniAuth provider you must register your application with
1. On your GitLab server, open the configuration file.
+ For omnibus package:
+
+ ```sh
+ sudo editor /etc/gitlab/gitlab.rb
+ ```
+
+ For instalations from source:
+
```sh
- cd /home/git/gitlab
+ cd /home/git/gitlab
- sudo -u git -H editor config/gitlab.yml
+ sudo -u git -H editor config/gitlab.yml
```
-1. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration)
-for more details.
+1. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for inital settings.
+
+1. Add the provider configuration:
+
+ For omnibus package:
+
+ ```ruby
+ gitlab_rails['omniauth_providers'] = [
+ {
+ "name" => "twitter",
+ "app_id" => "YOUR APP ID",
+ "app_secret" => "YOUR APP SECRET"
+ }
+ ]
+ ```
-1. Under `providers:` uncomment (or add) lines that look like the following:
+ For installations from source:
```
- - { name: 'twitter', app_id: 'YOUR APP ID',
- app_secret: 'YOUR APP SECRET' }
+ - { name: 'twitter', app_id: 'YOUR APP ID',
+ app_secret: 'YOUR APP SECRET' }
```
1. Change 'YOUR APP ID' to the API key from Twitter page in step 11.