diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 15:12:24 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 15:12:24 +0000 |
| commit | 3fa8bd0e67233cb3636490fb35993e2db3424772 (patch) | |
| tree | bdfcd534270b273f40730af702b66e2cfc058270 | |
| parent | e0609a7800000196e561f54124f4ac06e6d780f0 (diff) | |
| parent | 9d594380945a17a30d586c36db7867595950feb8 (diff) | |
| download | gitlab-ce-3fa8bd0e67233cb3636490fb35993e2db3424772.tar.gz | |
Merge branch 'ee_features_in_example_config' into 'master'
Removes reference to Enterprise Edition ssh key sync feature.
fixes #2042
See merge request !1017
| -rw-r--r-- | config/gitlab.yml.example | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c7174f86014..4f7f0b6ef19 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -424,7 +424,6 @@ test: user_filter: '' group_base: 'ou=groups,dc=example,dc=com' admin_group: '' - sync_ssh_keys: false staging: <<: *base |