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. ...@@ -53,7 +53,7 @@ GitHub will generate an application ID and secret key for you to use.
"app_id" => "YOUR_APP_ID", "app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET", "app_secret" => "YOUR_APP_SECRET",
"url" => "https://github.com/", "url" => "https://github.com/",
"args" => { "scope" => "user:email" } } "args" => { "scope" => "user:email" }
} }
] ]
``` ```
...@@ -76,4 +76,4 @@ GitHub will generate an application ID and secret key for you to use. ...@@ -76,4 +76,4 @@ GitHub will generate an application ID and secret key for you to use.
On the sign in page there should now be a GitHub icon below the regular sign in form. 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. 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. If everything goes well the user will be returned to GitLab and will be signed in.
\ No newline at end of file
...@@ -58,7 +58,7 @@ GitLab.com will generate an application ID and secret key for you to use. ...@@ -58,7 +58,7 @@ GitLab.com will generate an application ID and secret key for you to use.
"name" => "gitlab", "name" => "gitlab",
"app_id" => "YOUR_APP_ID", "app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET", "app_secret" => "YOUR_APP_SECRET",
"args" => { "scope" => "api" } } "args" => { "scope" => "api" }
} }
] ]
``` ```
...@@ -81,4 +81,4 @@ GitLab.com will generate an application ID and secret key for you to use. ...@@ -81,4 +81,4 @@ GitLab.com will generate an 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. 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. 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
...@@ -55,7 +55,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application ...@@ -55,7 +55,7 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
"name" => "google_oauth2", "name" => "google_oauth2",
"app_id" => "YOUR_APP_ID", "app_id" => "YOUR_APP_ID",
"app_secret" => "YOUR_APP_SECRET", "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