Commit 454810fe authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 7e574a89 410c8024
......@@ -53,7 +53,7 @@ GitHub will generate an application ID and secret key for you to use.
"app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET",
"url" => "https://github.com/",
"args" => { "scope" => "user:email" } }
"args" => { "scope" => "user:email" }
}
]
```
......
......@@ -58,7 +58,7 @@ GitLab.com will generate an application ID and secret key for you to use.
"name" => "gitlab",
"app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET",
"args" => { "scope" => "api" } }
"args" => { "scope" => "api" }
}
]
```
......
......@@ -55,7 +55,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
"name" => "google_oauth2",
"app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET",
"args" => { "access_type" => "offline", "approval_prompt" => '' } }
"args" => { "access_type" => "offline", "approval_prompt" => '' }
}
]
```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment