From d65f2bad6c7f834b708886f1ee8160a67281638d Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Tue, 11 Nov 2014 16:30:14 +0100
Subject: Add documentation about buttons in gmail.

---
 doc/integration/gitlab_actions.png         | Bin 0 -> 17321 bytes
 doc/integration/gitlab_buttons_in_gmail.md |  11 +++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 doc/integration/gitlab_actions.png
 create mode 100644 doc/integration/gitlab_buttons_in_gmail.md

(limited to 'doc/integration')

diff --git a/doc/integration/gitlab_actions.png b/doc/integration/gitlab_actions.png
new file mode 100644
index 00000000000..b08f54d137b
Binary files /dev/null and b/doc/integration/gitlab_actions.png differ
diff --git a/doc/integration/gitlab_buttons_in_gmail.md b/doc/integration/gitlab_buttons_in_gmail.md
new file mode 100644
index 00000000000..5cfea5a90f8
--- /dev/null
+++ b/doc/integration/gitlab_buttons_in_gmail.md
@@ -0,0 +1,11 @@
+# GitLab buttons in gmail
+
+GitLab supports [Google actions in email](https://developers.google.com/gmail/markup/actions/actions-overview).
+
+If correctly setup, emails that require an action will be marked in Gmail.
+
+![gitlab_actions](gitlab_actions.png)
+
+To get this functioning, you need to be registered with Google.
+[See how to register with google in this document.](https://developers.google.com/gmail/markup/registering-with-google)
+
-- 
cgit v1.2.1


From cdc62cffcb86dfd939c119cba2acaf266af39f23 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Thu, 4 Dec 2014 15:22:10 +0100
Subject: Add rake task for google schema whitelisting.

---
 doc/integration/gitlab_buttons_in_gmail.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'doc/integration')

diff --git a/doc/integration/gitlab_buttons_in_gmail.md b/doc/integration/gitlab_buttons_in_gmail.md
index 5cfea5a90f8..0816509c557 100644
--- a/doc/integration/gitlab_buttons_in_gmail.md
+++ b/doc/integration/gitlab_buttons_in_gmail.md
@@ -9,3 +9,20 @@ If correctly setup, emails that require an action will be marked in Gmail.
 To get this functioning, you need to be registered with Google.
 [See how to register with google in this document.](https://developers.google.com/gmail/markup/registering-with-google)
 
+To aid the registering with google, GitLab offers a rake task that will send an email to google whitelisting email address from your GitLab server.
+
+To check what would be sent to the google email address, run the rake task:
+
+```bash
+bundle exec rake gitlab:mail_google_schema_whitelisting RAILS_ENV=production
+```
+
+**This will not send the email but give you the output of how the mail will look.**
+
+Copy the output of the rake task to [google email markup tester](https://www.google.com/webmasters/markup-tester/u/0/) and press "Validate".
+
+If you receive "No errors detected" message from the tester you can send the email using:
+
+```bash
+bundle exec rake gitlab:mail_google_schema_whitelisting RAILS_ENV=production SEND=true
+``
-- 
cgit v1.2.1


From 8b6a2829ce400dda594500d2a8822dfdb11d8781 Mon Sep 17 00:00:00 2001
From: Scott Stamp <scottstamp851@gmail.com>
Date: Mon, 8 Dec 2014 23:04:34 +0000
Subject: Example callback URL was incorrect (referencing
 /users/auth/github/callback,  not /users/auth/twitter/callback)

---
 doc/integration/twitter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/integration')

diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index d1b52927d30..b9e501c5ec1 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -13,7 +13,7 @@ To enable the Twitter OmniAuth provider you must register your application with
     something else descriptive.
     - Description: Create a description.
     - Website: The URL to your GitLab installation. 'https://gitlab.example.com'
-    - Callback URL: 'https://gitlab.example.com/users/auth/github/callback'
+    - Callback URL: 'https://gitlab.example.com/users/auth/twitter/callback'
     - Agree to the "Rules of the Road."
 
     ![Twitter App Details](twitter_app_details.png)
-- 
cgit v1.2.1


From 6d747cfd3a41d6e2f396855ef7f29f400ea3f4a8 Mon Sep 17 00:00:00 2001
From: Patricio Cano <patricio@gitlab.com>
Date: Thu, 18 Dec 2014 09:50:20 -0500
Subject: Added link to the configuration sample for OmniAuth providers when
 using Omnibus.

---
 doc/integration/omniauth.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc/integration')

diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 00adae58dfa..15b4fb622af 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -7,6 +7,7 @@ OmniAuth does not prevent standard GitLab authentication or LDAP (if configured)
 - [Initial OmniAuth Configuration](#initial-omniauth-configuration)
 - [Supported Providers](#supported-providers)
 - [Enable OmniAuth for an Existing User](#enable-omniauth-for-an-existing-user)
+- [OmniAuth configuration sample when using Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/tree/master#omniauth-google-twitter-github-login)
 
 ## Initial OmniAuth Configuration
 
-- 
cgit v1.2.1


From d5ae521cf798a4c553fcf836b51a28b65cd46da7 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 19 Jan 2015 12:19:21 -0800
Subject: update documentation regarding github_importer

---
 doc/integration/github.md      |   2 +-
 doc/integration/github_app.png | Bin 75607 -> 75297 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/integration')

diff --git a/doc/integration/github.md b/doc/integration/github.md
index 714593d8266..a586334b98d 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -14,7 +14,7 @@ To enable the GitHub OmniAuth provider you must register your application with G
     - Application name: This can be anything. Consider something like "\<Organization\>'s GitLab" or "\<Your Name\>'s GitLab" or something else descriptive.
     - Homepage URL: The URL to your GitLab installation. 'https://gitlab.company.com'
     - Application description: Fill this in if you wish.
-    - Authorization callback URL: 'https://gitlab.company.com/users/auth/github/callback'
+    - Authorization callback URL: 'https://gitlab.company.com/'
 1.  Select "Register application".
 
 1.  You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. ![GitHub app](github_app.png)
diff --git a/doc/integration/github_app.png b/doc/integration/github_app.png
index c0873b2e20d..d890345ced9 100644
Binary files a/doc/integration/github_app.png and b/doc/integration/github_app.png differ
-- 
cgit v1.2.1


From 43da3f0929521615fe77d1dcb85318a8128bb7e8 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 28 Jan 2015 11:09:11 +0100
Subject: Point out common LDAP port/method combinations

---
 doc/integration/ldap.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc/integration')

diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md
index 56b0d826adb..6172a61d005 100644
--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
@@ -76,6 +76,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
 EOS
 ```
 
+If you are getting 'Connection Refused' errors when trying to connect to the LDAP server please double-check the LDAP `port` and `method` settings used by GitLab.
+Common combinations are `method: 'plain'` and `port: 389`, OR `method: 'ssl'` and `port: 636`.
+
 If you are using a GitLab installation from source you can find the LDAP settings in `/home/git/gitlab/config/gitlab.yml`:
 
 ```
-- 
cgit v1.2.1


From 087c4cbc3cba2cce1c25773af304833d217976fc Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 28 Jan 2015 11:08:44 +0100
Subject: Make 'plain', port 389 the default for LDAP

---
 doc/integration/ldap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md
index 6172a61d005..125ce31b521 100644
--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
@@ -29,9 +29,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
   label: 'LDAP'
 
   host: '_your_ldap_server'
-  port: 636
+  port: 389
   uid: 'sAMAccountName'
-  method: 'ssl' # "tls" or "ssl" or "plain"
+  method: 'plain' # "tls" or "ssl" or "plain"
   bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
   password: '_the_password_of_the_bind_user'
 
-- 
cgit v1.2.1


From e6e337088bbb4736983119928b6b6b451bd3ef20 Mon Sep 17 00:00:00 2001
From: Ewan Edwards <eedwards@perforce.com>
Date: Fri, 30 Jan 2015 10:24:45 -0800
Subject: Make all non-config/non-operational mentions of URL consistently
 capitalized.

Make the plural version consistently "URLs".

Fix an instance where the article "the" before URL was missing.
---
 doc/integration/shibboleth.md | 4 ++--
 doc/integration/slack.md      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md
index 78317a5c0f2..1b03197b6c7 100644
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
@@ -14,7 +14,7 @@ Check https://wiki.shibboleth.net/ for more info.
 
 Following changes are needed to enable shibboleth:
 
-protect omniauth-shibboleth callback url:
+protect omniauth-shibboleth callback URL:
 ```
   <Location /users/auth/shibboleth/callback>
     AuthType shibboleth
@@ -32,7 +32,7 @@ protect omniauth-shibboleth callback url:
     SetHandler shib
   </Location>
 ```
-exclude shibboleth urls from rewriting, add "RewriteCond %{REQUEST_URI} !/Shibboleth.sso" and "RewriteCond %{REQUEST_URI} !/shibboleth-sp", config should look like this:
+exclude shibboleth URLs from rewriting, add "RewriteCond %{REQUEST_URI} !/Shibboleth.sso" and "RewriteCond %{REQUEST_URI} !/shibboleth-sp", config should look like this:
 ```
   #apache equivalent of nginx try files
   RewriteEngine on
diff --git a/doc/integration/slack.md b/doc/integration/slack.md
index f2e73f272ef..2fd22c513ad 100644
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
@@ -35,7 +35,7 @@ After Slack is ready we need to setup GitLab. Here are the steps to achieve this
 1.  Fill in your Slack details
 
     - Mark it as active
-    - Paste in the webhook url you got from Slack
+    - Paste in the webhook URL you got from Slack
 
 Have fun :)
 
-- 
cgit v1.2.1


From ad6c372eeee5d112ad199dd4e487df584976445d Mon Sep 17 00:00:00 2001
From: Ewan Edwards <eedwards@perforce.com>
Date: Tue, 3 Feb 2015 15:18:40 -0800
Subject: Fix a number of discovered typos, capitalization of developer and
 product names, plus a couple of instances of bad Markdown markup.

---
 doc/integration/README.md                  | 2 +-
 doc/integration/external-issue-tracker.md  | 2 +-
 doc/integration/gitlab_buttons_in_gmail.md | 4 ++--
 doc/integration/shibboleth.md              | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/README.md b/doc/integration/README.md
index 357ed038314..0087167bb84 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -13,7 +13,7 @@ Jenkins support is [available in GitLab EE](http://doc.gitlab.com/ee/integration
 
 ## Project services
 
-Integration with services such as Campfire, Flowdock, Gemnasium, HipChat, PivotalTracker and Slack are available in the from of a Project Service.
+Integration with services such as Campfire, Flowdock, Gemnasium, HipChat, Pivotal Tracker, and Slack are available in the form of a Project Service.
 You can find these within GitLab in the Services page under Project Settings if you are at least a master on the project.
 Project Services are a bit like plugins in that they allow a lot of freedom in adding functionality to GitLab, for example there is also a service that can send an email every time someone pushes new commits.
 Because GitLab is open source we can ship with the code and tests for all plugins.
diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index 87af94512ed..ba4df9f8fe0 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -6,7 +6,7 @@ GitLab has a great issue tracker but you can also use an external issue tracker
 - clicking 'New issue' on the project dashboard creates a new JIRA issue;
 - To reference JIRA issue PROJECT-1234 in comments, use syntax PROJECT-1234. Commit messages get turned into HTML links to the corresponding JIRA issue.
 
-![jira screenshot](jira-integration-points.png)
+![Jira screenshot](jira-integration-points.png)
 
 You can configure the integration in the gitlab.yml configuration file.
 
diff --git a/doc/integration/gitlab_buttons_in_gmail.md b/doc/integration/gitlab_buttons_in_gmail.md
index 0816509c557..a9885cef109 100644
--- a/doc/integration/gitlab_buttons_in_gmail.md
+++ b/doc/integration/gitlab_buttons_in_gmail.md
@@ -1,4 +1,4 @@
-# GitLab buttons in gmail
+# GitLab buttons in Gmail
 
 GitLab supports [Google actions in email](https://developers.google.com/gmail/markup/actions/actions-overview).
 
@@ -25,4 +25,4 @@ If you receive "No errors detected" message from the tester you can send the ema
 
 ```bash
 bundle exec rake gitlab:mail_google_schema_whitelisting RAILS_ENV=production SEND=true
-``
+```
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md
index 1b03197b6c7..ea11f1afeab 100644
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
@@ -2,7 +2,7 @@
 
 This documentation is for enabling shibboleth with gitlab-omnibus package.
 
-In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however I did not found way to easily configure nginx that is bundled in gitlab-omnibus package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider. 
+In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however I did not found way to easily configure Nginx that is bundled in gitlab-omnibus package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider. 
 
 
 To enable the Shibboleth OmniAuth provider you must:
@@ -10,7 +10,7 @@ To enable the Shibboleth OmniAuth provider you must:
 1. Configure Apache shibboleth module. Installation and configuration of module it self is out of scope of this document. 
 Check https://wiki.shibboleth.net/ for more info.
 
-1. You can find Apache config in gitlab-reciepes (https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/apache/gitlab-ssl.conf)
+1. You can find Apache config in gitlab-recipes (https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/apache/gitlab-ssl.conf)
 
 Following changes are needed to enable shibboleth:
 
@@ -34,7 +34,7 @@ protect omniauth-shibboleth callback URL:
 ```
 exclude shibboleth URLs from rewriting, add "RewriteCond %{REQUEST_URI} !/Shibboleth.sso" and "RewriteCond %{REQUEST_URI} !/shibboleth-sp", config should look like this:
 ```
-  #apache equivalent of nginx try files
+  # Apache equivalent of Nginx try files
   RewriteEngine on
   RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_URI} !/Shibboleth.sso 
@@ -50,7 +50,7 @@ File it should look like this:
 external_url 'https://gitlab.example.com'
 gitlab_rails['internal_api_url'] = 'https://gitlab.example.com'
 
-# disable nginx
+# disable Nginx
 nginx['enable'] = false
 
 gitlab_rails['omniauth_allow_single_sign_on'] = true
-- 
cgit v1.2.1


From 5194214e3a2f97accf0c8119b4cb39fd4fcef5db Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 27 Jan 2015 15:37:19 -0800
Subject: GitLab integration. Importer

---
 doc/integration/gitlab.md | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 doc/integration/gitlab.md

(limited to 'doc/integration')

diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
new file mode 100644
index 00000000000..47f187b021c
--- /dev/null
+++ b/doc/integration/gitlab.md
@@ -0,0 +1,54 @@
+# GitLab OAuth2 OmniAuth Provider
+
+To enable the GitLab OmniAuth provider you must register your application with GitLab. GitLab will generate a client ID and secret key for you to use.
+
+1.  Sign in to GitLab.
+
+1.  Navigate to your settings.
+
+1.  Select "Applications" in the left menu.
+
+1.  Select "New application".
+
+1.  Provide the required details.
+    - Name: This can be anything. Consider something like "\<Organization\>'s GitLab" or "\<Your Name\>'s GitLab" or something else descriptive.
+    - Redirect URI: 
+    
+    ```
+    http://gitlab.example.com/importers/gitlab/callback
+    http://gitlab.example.com/users/auth/gitlab/callback
+    ```
+
+    The first link is required for the importer and second for the authorization. 
+
+1.  Select "Submit".
+
+1.  You should now see a Application ID and Secret. Keep this page open as you continue configuration.
+
+1.  On your GitLab server, open the configuration file.
+
+    ```sh
+    cd /home/git/gitlab
+
+    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.  Under `providers:` uncomment (or add) lines that look like the following:
+
+    ```
+        - { name: 'gitlab', app_id: 'YOUR APP ID',
+          app_secret: 'YOUR APP SECRET',
+          args: { scope: 'api' } }
+    ```
+
+1.  Change 'YOUR APP ID' to the Application ID from the GitLab application page.
+
+1.  Change 'YOUR APP SECRET' to the secret from the GitLab application page.
+
+1.  Save the configuration file.
+
+1.  Restart GitLab for the changes to take effect.
+
+On the sign in page there should now be a GitLab icon below the regular sign in form. Click the icon to begin the authentication process. GitLab will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to your GitLab instance and will be signed in.
-- 
cgit v1.2.1


From 33349dd54928a0b074b4ae3ebfabf214799fc085 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 2 Feb 2015 17:01:07 -0800
Subject: GitLab.com integration: refactoring

---
 doc/integration/gitlab.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/integration')

diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index 47f187b021c..b3b1d897225 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -15,7 +15,7 @@ To enable the GitLab OmniAuth provider you must register your application with G
     - Redirect URI: 
     
     ```
-    http://gitlab.example.com/importers/gitlab/callback
+    http://gitlab.example.com/import/gitlab/callback
     http://gitlab.example.com/users/auth/gitlab/callback
     ```
 
-- 
cgit v1.2.1


From eccf695640680050127c830887631d241dc7c8be Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Thu, 12 Feb 2015 17:06:55 -0800
Subject: Explained in the integration documentation how to enable external
 issue tracker

---
 doc/integration/external-issue-tracker.md    |  35 +++++++++++++++++++++++----
 doc/integration/redmine_configuration.png    | Bin 0 -> 118752 bytes
 doc/integration/redmine_service_template.png | Bin 0 -> 198077 bytes
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 doc/integration/redmine_configuration.png
 create mode 100644 doc/integration/redmine_service_template.png

(limited to 'doc/integration')

diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index ba4df9f8fe0..a4f67daa563 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -1,13 +1,38 @@
 # External issue tracker
 
-GitLab has a great issue tracker but you can also use an external issue tracker such as JIRA, Bugzilla or Redmine. This is something that you can turn on per GitLab project. If for example you configure JIRA it provides the following functionality:
+GitLab has a great issue tracker but you can also use an external issue tracker such as Jira, Bugzilla or Redmine. This is something that you can turn on per GitLab project. If for example you configure Jira it provides the following functionality:
 
-- the 'Issues' link on the GitLab project pages takes you to the appropriate JIRA issue index;
-- clicking 'New issue' on the project dashboard creates a new JIRA issue;
-- To reference JIRA issue PROJECT-1234 in comments, use syntax PROJECT-1234. Commit messages get turned into HTML links to the corresponding JIRA issue.
+- the 'Issues' link on the GitLab project pages takes you to the appropriate Jira issue index;
+- clicking 'New issue' on the project dashboard creates a new Jira issue;
+- To reference Jira issue PROJECT-1234 in comments, use syntax PROJECT-1234. Commit messages get turned into HTML links to the corresponding Jira issue.
 
 ![Jira screenshot](jira-integration-points.png)
 
-You can configure the integration in the gitlab.yml configuration file.
+## Configuration
+
+### Project Service
+
+External issue tracker can be enabled per project basis. As an example, we will configure `Redmine` for project named gitlab-ci.
+
+Fill in the required details on the page:
+
+![redmine configuration](redmine_configuration.png)
+
+* `description` A name for the issue tracker (to differentiate between instances, for example).
+* `project_url` The URL to the project in Redmine which is being linked to this GitLab project.
+* `issues_url` The URL to the issue in Redmine project that is linked to this GitLab project. Note that the `issues_url` requires `:id` in the url. This id GitLab uses as a placeholder to replace the issue number.
+* `new_issue_url` This is the URL to create a new issue in Redmine for the project linked to this GitLab project.
+
+
+### Service Template
+
+Since external issue tracker needs some project specific details, it is required to enable issue tracker per project level.
+GitLab makes this easier by allowing admin to add a service template which will allow GitLab project user with permissions to edit details for its project.
+
+In GitLab Admin section, navigate to `Service Templates` and choose the service template you want to create:
+
+![redmine service template](redmine_service_template.png)
+
+After the template is created, the template details will be pre-filled on the project service page.
 
 Support to add your commits to the Jira ticket automatically is [available in GitLab EE](http://doc.gitlab.com/ee/integration/jira.html).
diff --git a/doc/integration/redmine_configuration.png b/doc/integration/redmine_configuration.png
new file mode 100644
index 00000000000..6b145363229
Binary files /dev/null and b/doc/integration/redmine_configuration.png differ
diff --git a/doc/integration/redmine_service_template.png b/doc/integration/redmine_service_template.png
new file mode 100644
index 00000000000..1159eb5b964
Binary files /dev/null and b/doc/integration/redmine_service_template.png differ
-- 
cgit v1.2.1


From 01c6806f804d9b76042229e11077190975eb8bf0 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 13 Feb 2015 08:56:25 -0800
Subject: Text changes recommended by Job.

---
 doc/integration/external-issue-tracker.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index a4f67daa563..53d6898b6e8 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -1,6 +1,6 @@
 # External issue tracker
 
-GitLab has a great issue tracker but you can also use an external issue tracker such as Jira, Bugzilla or Redmine. This is something that you can turn on per GitLab project. If for example you configure Jira it provides the following functionality:
+GitLab has a great issue tracker but you can also use an external issue tracker such as Jira, Bugzilla or Redmine. You can configure issue trackers per GitLab project. For instance, if you configure Jira it allows you to do the following:
 
 - the 'Issues' link on the GitLab project pages takes you to the appropriate Jira issue index;
 - clicking 'New issue' on the project dashboard creates a new Jira issue;
@@ -12,7 +12,7 @@ GitLab has a great issue tracker but you can also use an external issue tracker
 
 ### Project Service
 
-External issue tracker can be enabled per project basis. As an example, we will configure `Redmine` for project named gitlab-ci.
+You can enable an external issue tracker per project. As an example, we will configure `Redmine` for project named gitlab-ci.
 
 Fill in the required details on the page:
 
@@ -20,14 +20,14 @@ Fill in the required details on the page:
 
 * `description` A name for the issue tracker (to differentiate between instances, for example).
 * `project_url` The URL to the project in Redmine which is being linked to this GitLab project.
-* `issues_url` The URL to the issue in Redmine project that is linked to this GitLab project. Note that the `issues_url` requires `:id` in the url. This id GitLab uses as a placeholder to replace the issue number.
+* `issues_url` The URL to the issue in Redmine project that is linked to this GitLab project. Note that the `issues_url` requires `:id` in the url. This id is used by GitLab as a placeholder to replace the issue number.
 * `new_issue_url` This is the URL to create a new issue in Redmine for the project linked to this GitLab project.
 
 
 ### Service Template
 
-Since external issue tracker needs some project specific details, it is required to enable issue tracker per project level.
-GitLab makes this easier by allowing admin to add a service template which will allow GitLab project user with permissions to edit details for its project.
+It is necessary to configure the external issue tracker per project, because project specific details are needed for the integration with GitLab.
+The admin can add a service template that sets a default for each project. This makes it much easier to configure individual projects.
 
 In GitLab Admin section, navigate to `Service Templates` and choose the service template you want to create:
 
-- 
cgit v1.2.1


From d9b32f20c6847e45200c38cc4476c3b825434f4f Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Fri, 13 Feb 2015 18:17:08 +0200
Subject: OAuth2 provider documentation

---
 doc/integration/README.md                          |   3 +-
 doc/integration/oauth_provider.md                  |  31 +++++++++++++++++++++
 .../oauth_provider/admin_application.png           | Bin 0 -> 55533 bytes
 .../oauth_provider/application_form.png            | Bin 0 -> 25075 bytes
 .../oauth_provider/authorized_application.png      | Bin 0 -> 17260 bytes
 .../oauth_provider/user_wide_applications.png      | Bin 0 -> 46238 bytes
 6 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 doc/integration/oauth_provider.md
 create mode 100644 doc/integration/oauth_provider/admin_application.png
 create mode 100644 doc/integration/oauth_provider/application_form.png
 create mode 100644 doc/integration/oauth_provider/authorized_application.png
 create mode 100644 doc/integration/oauth_provider/user_wide_applications.png

(limited to 'doc/integration')

diff --git a/doc/integration/README.md b/doc/integration/README.md
index 0087167bb84..1fc8ab997ec 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -6,8 +6,9 @@ See the documentation below for details on how to configure these services.
 
 - [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc.
 - [LDAP](ldap.md) Set up sign in via LDAP
-- [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, and Google via OAuth.
+- [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab, and Google via OAuth.
 - [Slack](slack.md) Integrate with the Slack chat service
+- [OAuth2 provider](oauth_provider.md) OAuth2 application creation
 
 Jenkins support is [available in GitLab EE](http://doc.gitlab.com/ee/integration/jenkins.html).
 
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md
new file mode 100644
index 00000000000..5fdb74a43df
--- /dev/null
+++ b/doc/integration/oauth_provider.md
@@ -0,0 +1,31 @@
+## GitLab as OAuth2 provider
+OAuth2 provides client applications a 'secure delegated access' to server resources on behalf of a resource owner. Or you can allow users to sign in to your application with their GitLab.com account.
+In fact OAuth allows to issue access token to third-party clients by an authorization server, 
+with the approval of the resource owner, or end-user. 
+Mostly, OAuth2 is using for SSO (Single sign-on). But you can find a lot of different usages for this functionality. 
+For example, our feature 'GitLab Importer' is using OAuth protocol to give an access to repositories without sharing user credentials to GitLab.com account. 
+Also GitLab.com application can be used for authentication to your GitLab instance if needed [GitLab OmniAuth](gitlab.md).
+
+GitLab has two ways to add new OAuth2 application to an instance, you can add application as regular user and through admin area. So GitLab actually can have an instance-wide and a user-wide applications. There is no defferences between them except the different permission levels.
+
+### Adding application through profile
+Go to your profile section 'Application' and press button 'New Application'
+
+![applications](oauth_provider/user_wide_applications.png)
+
+After this you will see application form, where "Name" is arbitrary name, "Redirect URI" is URL in your app where users will be sent after authorization on GitLab.com.
+
+![application_form](oauth_provider/application_form.png)
+
+### Authorized application
+Every application you authorized will be shown in your "Authorized application" sections.
+
+![authorized_application](oauth_provider/authorized_application.png)
+
+At any time you can revoke access just clicking button "Revoke"
+
+### OAuth applications in admin area
+
+If you want to create application that does not belong to certain user you can create it from admin area 
+
+![admin_application](oauth_provider/admin_application.png)
\ No newline at end of file
diff --git a/doc/integration/oauth_provider/admin_application.png b/doc/integration/oauth_provider/admin_application.png
new file mode 100644
index 00000000000..a5f34512aa8
Binary files /dev/null and b/doc/integration/oauth_provider/admin_application.png differ
diff --git a/doc/integration/oauth_provider/application_form.png b/doc/integration/oauth_provider/application_form.png
new file mode 100644
index 00000000000..ae135db2627
Binary files /dev/null and b/doc/integration/oauth_provider/application_form.png differ
diff --git a/doc/integration/oauth_provider/authorized_application.png b/doc/integration/oauth_provider/authorized_application.png
new file mode 100644
index 00000000000..d3ce05be9cc
Binary files /dev/null and b/doc/integration/oauth_provider/authorized_application.png differ
diff --git a/doc/integration/oauth_provider/user_wide_applications.png b/doc/integration/oauth_provider/user_wide_applications.png
new file mode 100644
index 00000000000..719e1974068
Binary files /dev/null and b/doc/integration/oauth_provider/user_wide_applications.png differ
-- 
cgit v1.2.1


From 78124d97836ebdfbb45c5567b9f2775889fd9718 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Fri, 13 Feb 2015 20:13:47 +0200
Subject: GitLab.com importer: documentation

---
 doc/integration/omniauth.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc/integration')

diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 15b4fb622af..7911cd3e84d 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -76,6 +76,7 @@ Before configuring individual OmniAuth providers there are a few global settings
 ## Supported Providers
 
 - [GitHub](github.md)
+- [GitLab](gitlab.md)
 - [Google](google.md)
 - [Shibboleth](shibboleth.md)
 - [Twitter](twitter.md)
-- 
cgit v1.2.1


From d76c5824bc05640d276be96f7853f2d266fd6750 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 13 Feb 2015 14:49:19 -0800
Subject: Update oauth documenatation with examples for omnibus package and
 installations from source.

---
 doc/integration/github.md     | 38 +++++++++++++++++----
 doc/integration/gitlab.md     | 45 +++++++++++++++++++------
 doc/integration/google.md     | 39 +++++++++++++++++-----
 doc/integration/omniauth.md   | 78 ++++++++++++++++++++-----------------------
 doc/integration/shibboleth.md | 14 ++++----
 doc/integration/twitter.md    | 35 +++++++++++++++----
 6 files changed, 168 insertions(+), 81 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/github.md b/doc/integration/github.md
index a586334b98d..c9c27859c5e 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -21,20 +21,44 @@ To enable the GitHub OmniAuth provider you must register your application with G
 
 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" => "github",
+          "app_id" => "YOUR APP ID",
+          "app_secret" => "YOUR APP SECRET",
+          "url" => "https://github.com/",
+          "args" => { "scope" => "user:email" } }
+        }
+      ]
+    ```
 
-1.  Under `providers:` uncomment (or add) lines that look like the following:
+    For installation from source:
 
     ```
-        - { name: 'github', app_id: 'YOUR APP ID',
-          app_secret: 'YOUR APP SECRET',
-          args: { scope: 'user:email' } }
+      - { name: 'github', app_id: 'YOUR APP ID',
+        app_secret: 'YOUR APP SECRET',
+        args: { scope: 'user:email' } }
     ```
 
 1.  Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7.
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index b3b1d897225..b95ef5c0af3 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -12,35 +12,60 @@ To enable the GitLab OmniAuth provider you must register your application with G
 
 1.  Provide the required details.
     - Name: This can be anything. Consider something like "\<Organization\>'s GitLab" or "\<Your Name\>'s GitLab" or something else descriptive.
-    - Redirect URI: 
-    
+    - Redirect URI:
+
     ```
     http://gitlab.example.com/import/gitlab/callback
     http://gitlab.example.com/users/auth/gitlab/callback
     ```
 
-    The first link is required for the importer and second for the authorization. 
+    The first link is required for the importer and second for the authorization.
 
 1.  Select "Submit".
 
 1.  You should now see a Application ID and Secret. Keep this page open as you continue configuration.
 
+1.  You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. ![GitHub app](github_app.png)
+
 1.  On your GitLab server, open the configuration file.
 
+    For omnibus package:
+
     ```sh
-    cd /home/git/gitlab
+      sudo editor /etc/gitlab/gitlab.rb
+    ```
+
+    For instalations from source:
 
-    sudo -u git -H editor config/gitlab.yml
+    ```sh
+      cd /home/git/gitlab
+
+      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" => "gitlab",
+          "app_id" => "YOUR APP ID",
+          "app_secret" => "YOUR APP SECRET",
+          "args" => { "scope" => "api" } }
+        }
+      ]
+    ```
 
-1.  Under `providers:` uncomment (or add) lines that look like the following:
+    For installations from source:
 
     ```
-        - { name: 'gitlab', app_id: 'YOUR APP ID',
-          app_secret: 'YOUR APP SECRET',
-          args: { scope: 'api' } }
+      - { name: 'gitlab', app_id: 'YOUR APP ID',
+        app_secret: 'YOUR APP SECRET',
+        args: { scope: 'api' } }
     ```
 
 1.  Change 'YOUR APP ID' to the Application ID from the GitLab application page.
diff --git a/doc/integration/google.md b/doc/integration/google.md
index 7a78aff8ea4..76beac16c49 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -27,22 +27,45 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
     - Authorized redirect URI: 'https://gitlab.example.com/users/auth/google_oauth2/callback'
 1. Under the heading "Client ID for web application" you should see a Client ID and Client secret (see screenshot). Keep this page open as you continue configuration. ![Google app](google_app.png)
 
-1. On your GitLab server, open the configuration file.
+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" => "google_oauth2",
+          "app_id" => "YOUR APP ID",
+          "app_secret" => "YOUR APP SECRET",
+          "args" => { "access_type" => "offline", "approval_prompt" => '' } }
+        }
+      ]
+    ```
 
-1.  Under `providers:` uncomment (or add) lines that look like the following:
+    For installations from source:
 
     ```
-           - { name: 'google_oauth2', app_id: 'YOUR APP ID',
-             app_secret: 'YOUR APP SECRET',
-             args: { access_type: 'offline', approval_prompt: '' } }
+     - { name: 'google_oauth2', app_id: 'YOUR APP ID',
+       app_secret: 'YOUR APP SECRET',
+       args: { access_type: 'offline', approval_prompt: '' } }
     ```
 
 1.  Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7.
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 7911cd3e84d..7433de33909 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -1,8 +1,8 @@
 # OmniAuth
 
-GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and other popular services. Configuring
+GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and other popular services.
 
-OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can choose to sign in using any of the configured mechanisms.
+Configuring OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can choose to sign in using any of the configured mechanisms.
 
 - [Initial OmniAuth Configuration](#initial-omniauth-configuration)
 - [Supported Providers](#supported-providers)
@@ -11,9 +11,37 @@ OmniAuth does not prevent standard GitLab authentication or LDAP (if configured)
 
 ## Initial OmniAuth Configuration
 
-Before configuring individual OmniAuth providers there are a few global settings that need to be verified.
+Before configuring individual OmniAuth providers there are a few global settings that are in common for all providers that we need to consider.
 
-1.  Open the configuration file.
+- Omniauth needs to be enabled, see details below for example.
+- `allow_single_sign_on` defaults to `false`. If `false` users must be created manually or they will not be able to
+sign in via OmniAuth.
+- `block_auto_created_users` defaults to `true`. If `true` auto created users will be blocked by default and will
+have to be unblocked by an administrator before they are able to sign in.
+- **Note:** If you set `allow_single_sign_on` to `true` and `block_auto_created_users` to `false` please be aware
+that any user on the Internet will be able to successfully sign in to your GitLab without administrative approval.
+
+If you want to change these settings:
+
+* **For omnibus package**
+
+    Open the configuration file:
+
+    ```sh
+    sudo editor /etc/gitlab/gitlab.rb
+    ```
+
+    and change
+
+    ```
+    gitlab_rails['omniauth_enabled'] = true
+    gitlab_rails['omniauth_allow_single_sign_on'] = false
+    gitlab_rails['block_auto_created_users'] = true
+    ```
+
+* **For installations from source**
+
+    Open the configuration file:
 
     ```sh
     cd /home/git/gitlab
@@ -21,13 +49,13 @@ Before configuring individual OmniAuth providers there are a few global settings
     sudo -u git -H editor config/gitlab.yml
     ```
 
-1.  Find the section dealing with OmniAuth. The section will look similar to the following.
+    and change the following section
 
     ```
-      ## OmniAuth settings
+     ## OmniAuth settings
       omniauth:
         # Allow login via Twitter, Google, etc. using OmniAuth providers
-        enabled: false
+        enabled: true
 
         # CAUTION!
         # This allows users to login without having a user account first (default: false).
@@ -35,43 +63,9 @@ Before configuring individual OmniAuth providers there are a few global settings
         allow_single_sign_on: false
         # Locks down those users until they have been cleared by the admin (default: true).
         block_auto_created_users: true
-
-        ## Auth providers
-        # Uncomment the following lines and fill in the data of the auth provider you want to use
-        # If your favorite auth provider is not listed you can use others:
-        # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations
-        # The 'app_id' and 'app_secret' parameters are always passed as the first two
-        # arguments, followed by optional 'args' which can be either a hash or an array.
-        providers:
-        # - { name: 'google_oauth2', app_id: 'YOUR APP ID',
-        #     app_secret: 'YOUR APP SECRET',
-        #     args: { access_type: 'offline', approval_prompt: '' } }
-        # - { name: 'twitter', app_id: 'YOUR APP ID',
-        #     app_secret: 'YOUR APP SECRET'}
-        # - { name: 'github', app_id: 'YOUR APP ID',
-        #     app_secret: 'YOUR APP SECRET',
-        #     args: { scope: 'user:email' } }
-        # - {"name": 'shibboleth',
-        #     args: { shib_session_id_field: "HTTP_SHIB_SESSION_ID",
-        #     shib_application_id_field: "HTTP_SHIB_APPLICATION_ID",
-        #     uid_field: "HTTP_EPPN",
-        #     name_field: "HTTP_CN",
-        #     info_fields: {"email": "HTTP_MAIL" } } }
-
     ```
 
-1.  Change `enabled` to `true`.
-
-1.  Consider the next two configuration options: `allow_single_sign_on` and `block_auto_created_users`.
-
-    - `allow_single_sign_on` defaults to `false`. If `false` users must be created manually or they will not be able to
-    sign in via OmniAuth.
-    - `block_auto_created_users` defaults to `true`. If `true` auto created users will be blocked by default and will
-    have to be unblocked by an administrator before they are able to sign in.
-    - **Note:** If you set `allow_single_sign_on` to `true` and `block_auto_created_users` to `false` please be aware
-    that any user on the Internet will be able to successfully sign in to your GitLab without administrative approval.
-
-1.  Choose one or more of the Supported Providers below to continue configuration.
+Now we can choose one or more of the Supported Providers below to continue configuration.
 
 ## Supported Providers
 
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md
index ea11f1afeab..6258e5f1030 100644
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
@@ -2,12 +2,12 @@
 
 This documentation is for enabling shibboleth with gitlab-omnibus package.
 
-In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however I did not found way to easily configure Nginx that is bundled in gitlab-omnibus package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider. 
+In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however I did not found way to easily configure Nginx that is bundled in gitlab-omnibus package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider.
 
 
 To enable the Shibboleth OmniAuth provider you must:
 
-1. Configure Apache shibboleth module. Installation and configuration of module it self is out of scope of this document. 
+1. Configure Apache shibboleth module. Installation and configuration of module it self is out of scope of this document.
 Check https://wiki.shibboleth.net/ for more info.
 
 1. You can find Apache config in gitlab-recipes (https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/apache/gitlab-ssl.conf)
@@ -37,15 +37,15 @@ exclude shibboleth URLs from rewriting, add "RewriteCond %{REQUEST_URI} !/Shibbo
   # Apache equivalent of Nginx try files
   RewriteEngine on
   RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
-  RewriteCond %{REQUEST_URI} !/Shibboleth.sso 
-  RewriteCond %{REQUEST_URI} !/shibboleth-sp 
+  RewriteCond %{REQUEST_URI} !/Shibboleth.sso
+  RewriteCond %{REQUEST_URI} !/shibboleth-sp
   RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA]
   RequestHeader set X_FORWARDED_PROTO 'https'
 ```
 
-1.  Edit /etc/gitlab/gitlab.rb configuration file, your shibboleth attributes should be in form of "HTTP_ATTRIBUTE" and you should addjust them to your need and environment. Add any other configuration you need. 
+1.  Edit /etc/gitlab/gitlab.rb configuration file, your shibboleth attributes should be in form of "HTTP_ATTRIBUTE" and you should addjust them to your need and environment. Add any other configuration you need.
 
-File it should look like this:
+File should look like this:
 ```
 external_url 'https://gitlab.example.com'
 gitlab_rails['internal_api_url'] = 'https://gitlab.example.com'
@@ -70,7 +70,7 @@ gitlab_rails['omniauth_providers'] = [
 ]
 
 ```
-1. Save changes and reconfigure gitlab: 
+1. Save changes and reconfigure gitlab:
 ```
 sudo gitlab-ctl reconfigure
 ```
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.
-- 
cgit v1.2.1


From ebd00cc7f0da544f03e04464031085b66306a43f Mon Sep 17 00:00:00 2001
From: Zhang Sen <sen@senorsen.com>
Date: Sun, 15 Feb 2015 18:24:00 +0800
Subject: Fix wrong word in document of google oauth

---
 doc/integration/google.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/google.md b/doc/integration/google.md
index 7a78aff8ea4..51d740489da 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -45,9 +45,9 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
              args: { access_type: 'offline', approval_prompt: '' } }
     ```
 
-1.  Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7.
+1.  Change 'YOUR APP ID' to the client ID from the Google Developer page from step 10.
 
-1.  Change 'YOUR APP SECRET' to the client secret from the GitHub application page  from step 7.
+1.  Change 'YOUR APP SECRET' to the client secret from the Google Developer page from step 10.
 
 1.  Save the configuration file.
 
-- 
cgit v1.2.1


From 10e4e2110c388ac43f1ebf437b963f13a1882129 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytse@gitlab.com>
Date: Wed, 18 Feb 2015 20:49:19 -0800
Subject: Improve the explanation and linking of the Oauth docs.

---
 doc/integration/README.md                 | 3 +--
 doc/integration/external-issue-tracker.md | 3 ++-
 doc/integration/oauth_provider.md         | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/README.md b/doc/integration/README.md
index 1fc8ab997ec..e5f33d8deed 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -8,9 +8,8 @@ See the documentation below for details on how to configure these services.
 - [LDAP](ldap.md) Set up sign in via LDAP
 - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab, and Google via OAuth.
 - [Slack](slack.md) Integrate with the Slack chat service
-- [OAuth2 provider](oauth_provider.md) OAuth2 application creation
 
-Jenkins support is [available in GitLab EE](http://doc.gitlab.com/ee/integration/jenkins.html).
+GitLab Enterprise Edition contains [advanced JIRA support](http://doc.gitlab.com/ee/integration/jira.html) and [advanced Jenkins support](http://doc.gitlab.com/ee/integration/jenkins.html).
 
 ## Project services
 
diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index 53d6898b6e8..96755707dee 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -8,6 +8,8 @@ GitLab has a great issue tracker but you can also use an external issue tracker
 
 ![Jira screenshot](jira-integration-points.png)
 
+GitLab Enterprise Edition contains [advanced JIRA support](http://doc.gitlab.com/ee/integration/jira.html).
+
 ## Configuration
 
 ### Project Service
@@ -23,7 +25,6 @@ Fill in the required details on the page:
 * `issues_url` The URL to the issue in Redmine project that is linked to this GitLab project. Note that the `issues_url` requires `:id` in the url. This id is used by GitLab as a placeholder to replace the issue number.
 * `new_issue_url` This is the URL to create a new issue in Redmine for the project linked to this GitLab project.
 
-
 ### Service Template
 
 It is necessary to configure the external issue tracker per project, because project specific details are needed for the integration with GitLab.
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md
index 5fdb74a43df..192c321f712 100644
--- a/doc/integration/oauth_provider.md
+++ b/doc/integration/oauth_provider.md
@@ -1,4 +1,8 @@
-## GitLab as OAuth2 provider
+## GitLab as OAuth2 authentication service provider
+
+This document is about using GitLab as an OAuth authentication service provider to sign into other services.
+If you want to use other OAuth authentication service providers to sign into GitLab please see the [OAuth2 client documentation](../api/oauth2.md)
+
 OAuth2 provides client applications a 'secure delegated access' to server resources on behalf of a resource owner. Or you can allow users to sign in to your application with their GitLab.com account.
 In fact OAuth allows to issue access token to third-party clients by an authorization server, 
 with the approval of the resource owner, or end-user. 
-- 
cgit v1.2.1


From ff70d2f24e8b437a4c006b61a9b669309718baad Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 22:06:49 -0800
Subject: Improve GitLab.com integration documentation

---
 doc/integration/gitlab.md      |  27 ++++++++++++++++-----------
 doc/integration/gitlab_app.png | Bin 0 -> 55325 bytes
 2 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 doc/integration/gitlab_app.png

(limited to 'doc/integration')

diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index b95ef5c0af3..87400bed5b5 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -1,10 +1,13 @@
-# GitLab OAuth2 OmniAuth Provider
+# Integrate your server with GitLab.com
 
-To enable the GitLab OmniAuth provider you must register your application with GitLab. GitLab will generate a client ID and secret key for you to use.
+Import projects from GitLab.com and login to your GitLab instance with your GitLab.com account.
 
-1.  Sign in to GitLab.
+To enable the GitLab.com OmniAuth provider you must register your application with GitLab.com. 
+GitLab.com will generate a application ID and secret key for you to use.
 
-1.  Navigate to your settings.
+1.  Sign in to GitLab.com
+
+1.  Navigate to your profile settings.
 
 1.  Select "Applications" in the left menu.
 
@@ -15,17 +18,17 @@ To enable the GitLab OmniAuth provider you must register your application with G
     - Redirect URI:
 
     ```
-    http://gitlab.example.com/import/gitlab/callback
-    http://gitlab.example.com/users/auth/gitlab/callback
+    http://your-gitlab.example.com/import/gitlab/callback
+    http://your-gitlab.example.com/users/auth/gitlab/callback
     ```
 
     The first link is required for the importer and second for the authorization.
 
 1.  Select "Submit".
 
-1.  You should now see a Application ID and Secret. Keep this page open as you continue configuration.
-
-1.  You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. ![GitHub app](github_app.png)
+1.  You should now see a Client ID and Client Secret near the top right of the page (see screenshot). 
+    Keep this page open as you continue configuration. 
+    ![GitLab app](gitlab_app.png)
 
 1.  On your GitLab server, open the configuration file.
 
@@ -43,7 +46,7 @@ To enable the GitLab OmniAuth provider you must register your application with G
       sudo -u git -H editor config/gitlab.yml
     ```
 
-1.  See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for inital settings.
+1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for inital settings.
 
 1.  Add the provider configuration:
 
@@ -76,4 +79,6 @@ To enable the GitLab OmniAuth provider you must register your application with G
 
 1.  Restart GitLab for the changes to take effect.
 
-On the sign in page there should now be a GitLab icon below the regular sign in form. Click the icon to begin the authentication process. GitLab will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to your GitLab instance and will be signed in.
+On the sign in page there should now be a GitLab.com icon below the regular sign in form. 
+Click the icon to begin the authentication process. GitLab.com will ask the user to sign in and authorize the GitLab application. 
+If everything goes well the user will be returned to your GitLab instance and will be signed in.
diff --git a/doc/integration/gitlab_app.png b/doc/integration/gitlab_app.png
new file mode 100644
index 00000000000..3f9391a821b
Binary files /dev/null and b/doc/integration/gitlab_app.png differ
-- 
cgit v1.2.1


From a3d039259e56cd7cb6551c21551f010ea12e6acc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 22:07:09 -0800
Subject: Fix broken links in documentation

---
 doc/integration/github.md   | 2 +-
 doc/integration/omniauth.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/github.md b/doc/integration/github.md
index c9c27859c5e..137d7e9d632 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -35,7 +35,7 @@ To enable the GitHub OmniAuth provider you must register your application with G
       sudo -u git -H editor config/gitlab.yml
     ```
 
-1.  See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for inital settings.
+1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for inital settings.
 
 1.  Add the provider configuration:
 
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 7433de33909..c92fa3ee4b7 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -70,7 +70,7 @@ Now we can choose one or more of the Supported Providers below to continue confi
 ## Supported Providers
 
 - [GitHub](github.md)
-- [GitLab](gitlab.md)
+- [GitLab.com](gitlab.md)
 - [Google](google.md)
 - [Shibboleth](shibboleth.md)
 - [Twitter](twitter.md)
-- 
cgit v1.2.1


From ad6d6232342558705c54ba70a94f9d7ddbd00f8c Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 17 Feb 2015 16:59:50 +0100
Subject: Add Bitbucket importer.

---
 doc/integration/bitbucket.m | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/integration/bitbucket.m

(limited to 'doc/integration')

diff --git a/doc/integration/bitbucket.m b/doc/integration/bitbucket.m
new file mode 100644
index 00000000000..30404ce4c54
--- /dev/null
+++ b/doc/integration/bitbucket.m
@@ -0,0 +1 @@
+TODO
\ No newline at end of file
-- 
cgit v1.2.1


From 20691df230332022cb4d5008d84c7ee6e6c8dbfd Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 18 Feb 2015 22:42:52 +0100
Subject: Add Bitbucket integration docs.

---
 doc/integration/bitbucket.m  |  1 -
 doc/integration/bitbucket.md | 97 ++++++++++++++++++++++++++++++++++++++++++++
 doc/integration/github.md    | 29 ++++++++-----
 doc/integration/gitlab.md    | 18 ++++----
 doc/integration/google.md    | 14 +++----
 doc/integration/omniauth.md  |  1 +
 doc/integration/twitter.md   | 14 +++----
 7 files changed, 139 insertions(+), 35 deletions(-)
 delete mode 100644 doc/integration/bitbucket.m
 create mode 100644 doc/integration/bitbucket.md

(limited to 'doc/integration')

diff --git a/doc/integration/bitbucket.m b/doc/integration/bitbucket.m
deleted file mode 100644
index 30404ce4c54..00000000000
--- a/doc/integration/bitbucket.m
+++ /dev/null
@@ -1 +0,0 @@
-TODO
\ No newline at end of file
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md
new file mode 100644
index 00000000000..9f24ad8c58d
--- /dev/null
+++ b/doc/integration/bitbucket.md
@@ -0,0 +1,97 @@
+# Integrate your server with Bitbucket
+
+Import projects from Bitbucket and login to your GitLab instance with your Bitbucket account.
+
+To enable the Bitbucket OmniAuth provider you must register your application with Bitbucket. 
+Bitbucket will generate an application ID and secret key for you to use.
+
+1.  Sign in to Bitbucket.
+
+1.  Navigate to your individual user settings or a team's settings, depending on how you want the application registered. It does not matter if the application is registered as an individual or a team - that is entirely up to you.
+
+1.  Select "OAuth" in the left menu.
+
+1.  Select "Add consumer".
+
+1.  Provide the required details.
+    - Name: This can be anything. Consider something like "\<Organization\>'s GitLab" or "\<Your Name\>'s GitLab" or something else descriptive.
+    - Application description: Fill this in if you wish.
+    - URL: The URL to your GitLab installation. 'https://gitlab.company.com'
+1.  Select "Save".
+
+1.  You should now see a Key and Secret in the list of OAuth customers. 
+    Keep this page open as you continue configuration. 
+
+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
+
+      sudo -u git -H editor config/gitlab.yml
+    ```
+
+1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
+
+1.  Add the provider configuration:
+
+    For omnibus package:
+
+    ```ruby
+      gitlab_rails['omniauth_providers'] = [
+        {
+          "name" => "bitbucket",
+          "app_id" => "YOUR_KEY",
+          "app_secret" => "YOUR_APP_SECRET",
+          "url" => "https://bitbucket.org/"
+        }
+      ]
+    ```
+
+    For installation from source:
+
+    ```
+      - { name: 'bitbucket', app_id: 'YOUR_KEY',
+        app_secret: 'YOUR_APP_SECRET' }
+    ```
+
+1.  Change 'YOUR_APP_ID' to the key from the Bitbucket application page from step 7.
+
+1.  Change 'YOUR_APP_SECRET' to the secret from the Bitbucket application page from step 7.
+
+1.  Save the configuration file.
+
+1.  Restart GitLab for the changes to take effect.
+
+On the sign in page there should now be a Bitbucket icon below the regular sign in form. 
+Click the icon to begin the authentication process. Bitbucket will ask the user to sign in and authorize the GitLab application. 
+If everything goes well the user will be returned to GitLab and will be signed in.
+
+## Bitbucket project import
+
+To allow projects to be imported directly into GitLab, Bitbucket requires one extra setup step compared to GitHub and GitLab.com. 
+
+Bitbucket doesn't allow OAuth applications to clone repositories over HTTPS, and instead requires GitLab to use SSH and identify itself using your GitLab server's SSH key.
+
+GitLab will automatically register your public key with Bitbucket as a deploy key for the repositories to be imported. Your public key needs to be at `~/.ssh/id_rsa.pub`, which will expand to `/home/git/.ssh/id_rsa.pub` in most configurations.
+
+If you have that file in place, you're all set and should see the "Import projects from Bitbucket" option enabled. If you don't, do the following:
+
+1. Create a new SSH key:
+
+    ```sh
+        sudo -u git -H ssh-keygen
+    ```
+
+    Make sure to use an **empty passphrase**.
+
+2. Restart GitLab to allow it to find the new public key.
+
+You should now see the "Import projects from Bitbucket" option on the New Project page enabled.
\ No newline at end of file
diff --git a/doc/integration/github.md b/doc/integration/github.md
index 137d7e9d632..a9f1bc31bb4 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -1,6 +1,9 @@
-# GitHub OAuth2 OmniAuth Provider
+# Integrate your server with GitHub
 
-To enable the GitHub OmniAuth provider you must register your application with GitHub. GitHub will generate a client ID and secret key for you to use.
+Import projects from GitHub and login to your GitLab instance with your GitHub account.
+
+To enable the GitHub OmniAuth provider you must register your application with GitHub. 
+GitHub will generate an application ID and secret key for you to use.
 
 1.  Sign in to GitHub.
 
@@ -17,7 +20,9 @@ To enable the GitHub OmniAuth provider you must register your application with G
     - Authorization callback URL: 'https://gitlab.company.com/'
 1.  Select "Register application".
 
-1.  You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. ![GitHub app](github_app.png)
+1.  You should now see a Client ID and Client Secret near the top right of the page (see screenshot). 
+    Keep this page open as you continue configuration.
+    ![GitHub app](github_app.png)
 
 1.  On your GitLab server, open the configuration file.
 
@@ -35,7 +40,7 @@ To enable the GitHub OmniAuth provider you must register your application with G
       sudo -u git -H editor config/gitlab.yml
     ```
 
-1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for inital settings.
+1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
 
 1.  Add the provider configuration:
 
@@ -45,8 +50,8 @@ To enable the GitHub OmniAuth provider you must register your application with G
       gitlab_rails['omniauth_providers'] = [
         {
           "name" => "github",
-          "app_id" => "YOUR APP ID",
-          "app_secret" => "YOUR APP SECRET",
+          "app_id" => "YOUR_APP_ID",
+          "app_secret" => "YOUR_APP_SECRET",
           "url" => "https://github.com/",
           "args" => { "scope" => "user:email" } }
         }
@@ -56,17 +61,19 @@ To enable the GitHub OmniAuth provider you must register your application with G
     For installation from source:
 
     ```
-      - { name: 'github', app_id: 'YOUR APP ID',
-        app_secret: 'YOUR APP SECRET',
+      - { name: 'github', app_id: 'YOUR_APP_ID',
+        app_secret: 'YOUR_APP_SECRET',
         args: { scope: 'user:email' } }
     ```
 
-1.  Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7.
+1.  Change 'YOUR_APP_ID' to the client ID from the GitHub application page from step 7.
 
-1.  Change 'YOUR APP SECRET' to the client secret from the GitHub application page  from step 7.
+1.  Change 'YOUR_APP_SECRET' to the client secret from the GitHub application page  from step 7.
 
 1.  Save the configuration file.
 
 1.  Restart GitLab for the changes to take effect.
 
-On the sign in page there should now be a GitHub icon below the regular sign in form. Click the icon to begin the authentication process. GitHub will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in.
+On the sign in page there should now be a GitHub icon below the regular sign in form. 
+Click the icon to begin the authentication process. GitHub will ask the user to sign in and authorize the GitLab application. 
+If everything goes well the user will be returned to GitLab and will be signed in.
\ No newline at end of file
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index 87400bed5b5..49ffaa62af8 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -3,7 +3,7 @@
 Import projects from GitLab.com and login to your GitLab instance with your GitLab.com account.
 
 To enable the GitLab.com OmniAuth provider you must register your application with GitLab.com. 
-GitLab.com will generate a application ID and secret key for you to use.
+GitLab.com will generate an application ID and secret key for you to use.
 
 1.  Sign in to GitLab.com
 
@@ -46,7 +46,7 @@ GitLab.com will generate a application ID and secret key for you to use.
       sudo -u git -H editor config/gitlab.yml
     ```
 
-1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for inital settings.
+1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
 
 1.  Add the provider configuration:
 
@@ -56,8 +56,8 @@ GitLab.com will generate a application ID and secret key for you to use.
       gitlab_rails['omniauth_providers'] = [
         {
           "name" => "gitlab",
-          "app_id" => "YOUR APP ID",
-          "app_secret" => "YOUR APP SECRET",
+          "app_id" => "YOUR_APP_ID",
+          "app_secret" => "YOUR_APP_SECRET",
           "args" => { "scope" => "api" } }
         }
       ]
@@ -66,14 +66,14 @@ GitLab.com will generate a application ID and secret key for you to use.
     For installations from source:
 
     ```
-      - { name: 'gitlab', app_id: 'YOUR APP ID',
-        app_secret: 'YOUR APP SECRET',
+      - { name: 'gitlab', app_id: 'YOUR_APP_ID',
+        app_secret: 'YOUR_APP_SECRET',
         args: { scope: 'api' } }
     ```
 
-1.  Change 'YOUR APP ID' to the Application ID from the GitLab application page.
+1.  Change 'YOUR_APP_ID' to the Application ID from the GitLab.com application page.
 
-1.  Change 'YOUR APP SECRET' to the secret from the GitLab application page.
+1.  Change 'YOUR_APP_SECRET' to the secret from the GitLab.com application page.
 
 1.  Save the configuration file.
 
@@ -81,4 +81,4 @@ GitLab.com will generate a application ID and secret key for you to use.
 
 On the sign in page there should now be a GitLab.com icon below the regular sign in form. 
 Click the icon to begin the authentication process. GitLab.com will ask the user to sign in and authorize the GitLab application. 
-If everything goes well the user will be returned to your GitLab instance and will be signed in.
+If everything goes well the user will be returned to your GitLab instance and will be signed in.
\ No newline at end of file
diff --git a/doc/integration/google.md b/doc/integration/google.md
index 168077c2770..d7b741ece69 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -43,7 +43,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
       sudo -u git -H editor config/gitlab.yml
     ```
 
-1.  See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for inital settings.
+1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
 
 1.  Add the provider configuration:
 
@@ -53,8 +53,8 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
       gitlab_rails['omniauth_providers'] = [
         {
           "name" => "google_oauth2",
-          "app_id" => "YOUR APP ID",
-          "app_secret" => "YOUR APP SECRET",
+          "app_id" => "YOUR_APP_ID",
+          "app_secret" => "YOUR_APP_SECRET",
           "args" => { "access_type" => "offline", "approval_prompt" => '' } }
         }
       ]
@@ -63,14 +63,14 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
     For installations from source:
 
     ```
-     - { name: 'google_oauth2', app_id: 'YOUR APP ID',
-       app_secret: 'YOUR APP SECRET',
+     - { name: 'google_oauth2', app_id: 'YOUR_APP_ID',
+       app_secret: 'YOUR_APP_SECRET',
        args: { access_type: 'offline', approval_prompt: '' } }
     ```
 
-1.  Change 'YOUR APP ID' to the client ID from the Google Developer page from step 10.
+1.  Change 'YOUR_APP_ID' to the client ID from the Google Developer page from step 10.
 
-1.  Change 'YOUR APP SECRET' to the client secret from the Google Developer page from step 10.
+1.  Change 'YOUR_APP_SECRET' to the client secret from the Google Developer page from step 10.
 
 1.  Save the configuration file.
 
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index c92fa3ee4b7..24f7b4bb4b4 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -70,6 +70,7 @@ Now we can choose one or more of the Supported Providers below to continue confi
 ## Supported Providers
 
 - [GitHub](github.md)
+- [Bitbucket](bitbucket.md)
 - [GitLab.com](gitlab.md)
 - [Google](google.md)
 - [Shibboleth](shibboleth.md)
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index 2d517b2fbc9..fe9091ad9a8 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -47,7 +47,7 @@ To enable the Twitter OmniAuth provider you must register your application with
       sudo -u git -H editor config/gitlab.yml
     ```
 
-1.  See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for inital settings.
+1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
 
 1.  Add the provider configuration:
 
@@ -57,8 +57,8 @@ To enable the Twitter OmniAuth provider you must register your application with
       gitlab_rails['omniauth_providers'] = [
         {
           "name" => "twitter",
-          "app_id" => "YOUR APP ID",
-          "app_secret" => "YOUR APP SECRET"
+          "app_id" => "YOUR_APP_ID",
+          "app_secret" => "YOUR_APP_SECRET"
         }
       ]
     ```
@@ -66,13 +66,13 @@ To enable the Twitter OmniAuth provider you must register your application with
     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.
+1.  Change 'YOUR_APP_ID' to the API key from Twitter page in step 11.
 
-1.  Change 'YOUR APP SECRET' to the API secret from the Twitter page in step 11.
+1.  Change 'YOUR_APP_SECRET' to the API secret from the Twitter page in step 11.
 
 1.  Save the configuration file.
 
-- 
cgit v1.2.1


From 56f51bed6b166f12b8b0f4f1bd883142c5e079a6 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 25 Feb 2015 00:04:48 +0100
Subject: Expand Bitbucket integration docs.

---
 doc/integration/bitbucket.md | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'doc/integration')

diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md
index 9f24ad8c58d..cc6389f5aaf 100644
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
@@ -76,22 +76,46 @@ If everything goes well the user will be returned to GitLab and will be signed i
 
 ## Bitbucket project import
 
-To allow projects to be imported directly into GitLab, Bitbucket requires one extra setup step compared to GitHub and GitLab.com. 
+To allow projects to be imported directly into GitLab, Bitbucket requires two extra setup steps compared to GitHub and GitLab.com. 
 
 Bitbucket doesn't allow OAuth applications to clone repositories over HTTPS, and instead requires GitLab to use SSH and identify itself using your GitLab server's SSH key.
 
-GitLab will automatically register your public key with Bitbucket as a deploy key for the repositories to be imported. Your public key needs to be at `~/.ssh/id_rsa.pub`, which will expand to `/home/git/.ssh/id_rsa.pub` in most configurations.
+### Step 1: Known hosts
+
+To allow GitLab to connect to Bitbucket over SSH, you need to add 'bitbucket.org' to your GitLab server's known SSH hosts. Take the following steps to do so:
+
+1. Manually connect to 'bitbucket.org' over SSH, while logged in as the `git` account that GitLab will use:
+
+    ```sh
+    ssh git@bitbucket.org
+    ```
+
+1.  Verify the RSA key fingerprint you'll see in the response matches the one in the [Bitbucket documentation](https://confluence.atlassian.com/display/BITBUCKET/Use+the+SSH+protocol+with+Bitbucket#UsetheSSHprotocolwithBitbucket-KnownhostorBitbucket'spublickeyfingerprints) (the specific IP address doesn't matter):
+
+    ```sh
+    The authenticity of host 'bitbucket.org (207.223.240.182)' can't be established.
+    RSA key fingerprint is 97:8c:1b:f2:6f:14:6b:5c:3b:ec:aa:46:46:74:7c:40.
+    Are you sure you want to continue connecting (yes/no)? 
+    ```
+
+1. If the fingerprint matches, type `yes` to continue connecting and have 'bitbucket.org' be added to your known hosts.
+
+1. Your GitLab server is now able to connect to Bitbucket over SSH. Continue to step 2:
+
+### Step 2: Public key
+
+To be able to access repositories on Bitbucket, GitLab will automatically register your public key with Bitbucket as a deploy key for the repositories to be imported. Your public key needs to be at `~/.ssh/id_rsa.pub`, which will expand to `/home/git/.ssh/id_rsa.pub` in most configurations. 
 
 If you have that file in place, you're all set and should see the "Import projects from Bitbucket" option enabled. If you don't, do the following:
 
 1. Create a new SSH key:
 
     ```sh
-        sudo -u git -H ssh-keygen
+    sudo -u git -H ssh-keygen
     ```
 
     Make sure to use an **empty passphrase**.
 
 2. Restart GitLab to allow it to find the new public key.
 
-You should now see the "Import projects from Bitbucket" option on the New Project page enabled.
\ No newline at end of file
+You should now see the "Import projects from Bitbucket" option on the New Project page enabled.
-- 
cgit v1.2.1