Commit aaffbe1c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'render_docs' into 'master'

Fix code block that doesn't render correctly in doc.gitlab.com

Probably fixes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/6
parents bf855d19 5a521e56
...@@ -21,6 +21,7 @@ Before configuring individual OmniAuth providers there are a few global settings ...@@ -21,6 +21,7 @@ Before configuring individual OmniAuth providers there are a few global settings
``` ```
2. Find the section dealing with OmniAuth. The section will look similar to the following.<br /> 2. Find the section dealing with OmniAuth. The section will look similar to the following.<br />
``` ```
## OmniAuth settings ## OmniAuth settings
omniauth: omniauth:
...@@ -50,6 +51,7 @@ Before configuring individual OmniAuth providers there are a few global settings ...@@ -50,6 +51,7 @@ Before configuring individual OmniAuth providers there are a few global settings
# app_secret: 'YOUR APP SECRET', # app_secret: 'YOUR APP SECRET',
# args: { scope: 'user:email' } } # args: { scope: 'user:email' } }
``` ```
3. Change `enabled` to `true`. 3. Change `enabled` to `true`.
4. Consider the next two configuration options: `allow_single_sign_on` and `block_auto_created_users`. 4. 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 * `allow_single_sign_on` defaults to `false`. If `false` users must be created manually or they will not be able to
......
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