Add Bitbucket integration docs.

app/views/import/bitbucket/status.html.haml

 %h3.page-title
   %i.fa.fa-bitbucket
-  Import repositories from Bitbucket
+  Import projects from Bitbucket
 %p.light
   Select projects you want to import.

app/views/import/github/status.html.haml

 %h3.page-title
   %i.fa.fa-github
-  Import repositories from GitHub
+  Import projects from GitHub
 %p.light
   Select projects you want to import.

app/views/import/gitlab/status.html.haml

 %h3.page-title
   %i.fa.fa-heart
-  Import repositories from GitLab.com
+  Import projects from GitLab.com
 %p.light
   Select projects you want to import.

app/views/projects/_bitbucket_import_modal.html.haml

@@ -3,7 +3,11 @@
     .modal-content
       .modal-header
         %a.close{href: "#", "data-dismiss" => "modal"} ×
-        %h3 GitHub OAuth import
+        %h3 Import projects from Bitbucket
       .modal-body
-        You need to setup integration with Bitbucket first.
-        = link_to 'How to setup integration with Bitbucket', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/bitbucket.md'
\ No newline at end of file
+        To enable importing projects from Bitbucket, 
+        - if current_user.admin?
+          you need to
+        - else
+          your GitLab administrator needs to
+        == #{link_to 'setup OAuth integration', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/butbucket.md'}.
\ No newline at end of file

app/views/projects/_github_import_modal.html.haml

@@ -3,7 +3,11 @@
     .modal-content
       .modal-header
         %a.close{href: "#", "data-dismiss" => "modal"} ×
-        %h3 GitHub OAuth import
+        %h3 Import projects from GitHub
       .modal-body
-        You need to setup integration with GitHub first.
-        = link_to 'How to setup integration with GitHub', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/github.md'
\ No newline at end of file
+        To enable importing projects from GitHub, 
+        - if current_user.admin?
+          you need to
+        - else
+          your GitLab administrator needs to
+        == #{link_to 'setup OAuth integration', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/github.md'}.
\ No newline at end of file

app/views/projects/_gitlab_import_modal.html.haml

@@ -3,7 +3,11 @@
     .modal-content
       .modal-header
         %a.close{href: "#", "data-dismiss" => "modal"} ×
-        %h3 GitLab OAuth import
+        %h3 Import projects from GitLab.com
       .modal-body
-        You need to setup integration with GitLab first.
-        = link_to 'How to setup integration with GitLab', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/gitlab.md'
\ No newline at end of file
+        To enable importing projects from GitLab.com, 
+        - if current_user.admin?
+          you need to
+        - else
+          your GitLab administrator needs to
+        == #{link_to 'setup OAuth integration', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/gitlab.md'}.
\ No newline at end of file

doc/integration/bitbucket.m

-TODO
\ No newline at end of file

doc/integration/bitbucket.md

+# 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

doc/integration/github.md

-# GitHub OAuth2 OmniAuth Provider
-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.
+# Integrate your server with GitHub
+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 SECRET' to the client secret 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.  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

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 SECRET' to the secret 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.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

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 SECRET' to the client secret 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.  Save the configuration file.

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)

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 SECRET' to the API secret from the 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.  Save the configuration file.