diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-12 17:44:02 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-12 17:44:02 +0200 |
| commit | 7b1bb0f4db3f729a045bc086efa0c22ca3d9270b (patch) | |
| tree | cc531d9dfbfc90952428550c737c77ff5cace745 /config/gitlab.yml.example | |
| parent | ea787165b3a9604aa86304e29778066bb014824e (diff) | |
| parent | d65d5c2d1a7e19c0a5a3ff6fcd68ce7fdf0661a2 (diff) | |
| download | gitlab-ce-7b1bb0f4db3f729a045bc086efa0c22ca3d9270b.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 4fbef653bc1..90224f9bbd6 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -80,7 +80,7 @@ production: &base # This happens when the commit is pushed or merged into the default branch of a project. # When not specified the default issue_closing_pattern as specified below will be used. # Tip: you can test your closing pattern at http://rubular.com. - # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?))+)' + # issue_closing_pattern: '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' ## Default project features settings default_projects_features: @@ -352,6 +352,8 @@ production: &base # # - { name: 'saml', # label: 'Our SAML Provider', + # groups_attribute: 'Groups', + # external_groups: ['Contractors', 'Freelancers'], # args: { # assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback', # idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8', @@ -359,6 +361,7 @@ production: &base # issuer: 'https://gitlab.example.com', # name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient' # } } + # # - { name: 'crowd', # args: { # crowd_server_url: 'CROWD SERVER URL', |