diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-11 20:30:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-11 20:30:25 +0000 |
| commit | 678bb48c5e49b0dfdc087a8a065070bf363a2416 (patch) | |
| tree | dc91fb5c3f74bcdcff34fa6df0f01eaf823347e0 | |
| parent | 4d30c0c5d3d0f23a221ee507b6bd110a539b8570 (diff) | |
| parent | 9c7bf3169eff7aaa7c262a1d09939916c2078ef9 (diff) | |
| download | gitlab-shell-678bb48c5e49b0dfdc087a8a065070bf363a2416.tar.gz | |
Merge branch 'note_in_config' into 'master'
Add a note that changing example configuration files requires changing omnibus-gitlab.
Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab.
Added a note so everyone is aware of this.
Similar is added to gitlab-ce and gitlab-ci.
Discussed in gitlab-org/omnibus-gitlab#605
See merge request !13
| -rw-r--r-- | config.yml.example | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.yml.example b/config.yml.example index 9dc30db..43d6e85 100644 --- a/config.yml.example +++ b/config.yml.example @@ -1,3 +1,8 @@ +# +# If you change this file in a Merge Request, please also create +# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests +# + # GitLab user. git by default user: git |