summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-11-03 16:16:15 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-11-03 16:16:30 -0500
commit05eb9e7884a1a1eb4144f84e7f586d26b011f4f1 (patch)
treec279c4c039d3f8c739e0d1f450abf829bacd1a3d
parent98dcad2762930b0dc967ff8e67f9f795228d2342 (diff)
downloadgitlab-ce-facebook-auth.tar.gz
Minor reformatting for Facebook integration docfacebook-auth
[ci skip]
-rw-r--r--doc/integration/facebook.md27
1 files changed, 14 insertions, 13 deletions
diff --git a/doc/integration/facebook.md b/doc/integration/facebook.md
index 5880b5baf76..bc1f1673086 100644
--- a/doc/integration/facebook.md
+++ b/doc/integration/facebook.md
@@ -19,7 +19,7 @@ something else descriptive.
1. Enter the address of your GitLab installation at the bottom of the package
- ![Facebook Website URL](facebook_website_url.png)
+ ![Facebook Website URL](facebook_website_url.png)
1. Choose "Next"
@@ -28,6 +28,7 @@ something else descriptive.
1. Choose "Settings" in the menu on the left
1. Fill in a contact email for your app
+
![Facebook App Settings](facebook_app_settings.png)
1. Choose "Save Changes"
@@ -51,15 +52,15 @@ something else descriptive.
For omnibus package:
```sh
- sudo editor /etc/gitlab/gitlab.rb
+ sudo editor /etc/gitlab/gitlab.rb
```
For installations 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. See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
@@ -69,20 +70,20 @@ something else descriptive.
For omnibus package:
```ruby
- gitlab_rails['omniauth_providers'] = [
- {
- "name" => "facebook",
- "app_id" => "YOUR_APP_ID",
- "app_secret" => "YOUR_APP_SECRET"
- }
- ]
+ gitlab_rails['omniauth_providers'] = [
+ {
+ "name" => "facebook",
+ "app_id" => "YOUR_APP_ID",
+ "app_secret" => "YOUR_APP_SECRET"
+ }
+ ]
```
For installations from source:
```
- - { name: 'facebook', app_id: 'YOUR_APP_ID',
- app_secret: 'YOUR_APP_SECRET' }
+ - { name: 'facebook', app_id: 'YOUR_APP_ID',
+ app_secret: 'YOUR_APP_SECRET' }
```
1. Change 'YOUR_APP_ID' to the API key from Facebook page in step 10.