Merge branch 'patch-2' into 'master'

Update cas.md to reflect the current syntax, and added that gitlab-ctl reconfigure should be run. I spent a while trying to figure our why the cas wasn't working! Someone may need to update the source code section of the wiki See merge request !3850

Merge branch 'patch-2' into 'master'
9393d6b6 · Marin Jankovski · 624dc104 · ff1e7474 · 9393d6b6
Commit 9393d6b6 authored May 12, 2016 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 8 deletions

cas.md doc/integration/cas.md +11 -8

No files found.
--- a/doc/integration/cas.md
+++ b/doc/integration/cas.md
@@ -27,17 +27,18 @@ To enable the CAS OmniAuth provider you must register your application with your
    ```ruby
      gitlab_rails['omniauth_providers'] = [
        {
-          name: "cas3",
-          label: "cas",
-          args: {
-                  url: 'CAS_SERVER',
-                  login_url: '/CAS_PATH/login',
-                  service_validate_url: '/CAS_PATH/p3/serviceValidate',
-                  logout_url: '/CAS_PATH/logout'} }
-          }
+            "name"=> "cas3",
+            "label"=> "cas",
+            "args"=> {
+                "url"=> 'CAS_SERVER',
+                "login_url"=> '/CAS_PATH/login',
+                "service_validate_url"=> '/CAS_PATH/p3/serviceValidate',
+                "logout_url"=> '/CAS_PATH/logout'
+            }
        }
      ]
    ```
+    

    For installations from source:

@@ -57,6 +58,8 @@ To enable the CAS OmniAuth provider you must register your application with your

 1.  Save the configuration file.

+1.  Run `gitlab-ctl reconfigure` for the omnibus package.
+
 1.  Restart GitLab for the changes to take effect.

 On the sign in page there should now be a CAS tab in the sign in form.