diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-12 09:02:48 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-12 09:02:48 +0000 |
| commit | b07cf1182f78c5c46edbfa0fde668dd75ae47e05 (patch) | |
| tree | 6856e4ee2a1012e11b2cfd368ad5ccc98f598734 /lib | |
| parent | 21a62bb9959b28793c3c4a2f2ae1b6b6afc2579e (diff) | |
| parent | df346e9507a057ccb72d4edad53674ac014333a0 (diff) | |
| download | gitlab-ce-b07cf1182f78c5c46edbfa0fde668dd75ae47e05.tar.gz | |
Merge branch 'note_about_omnibus_changes' 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-shell and gitlab-ci.
Discussed in gitlab-org/omnibus-gitlab#605
See merge request !800
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/nginx/gitlab | 8 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index 62a4276536c..4688a527eba 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -1,10 +1,16 @@ ## GitLab -## Contributors: randx, yin8086, sashkab, orkoden, axilleas, bbodenmiller, DouweM ## ## Lines starting with two hashes (##) are comments with information. ## Lines starting with one hash (#) are configuration parameters that can be uncommented. ## ################################## +## CONTRIBUTING ## +################################## +## +## 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 +## +################################## ## CHUNKED TRANSFER ## ################################## ## diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index 2aefc944698..187a27e93b0 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -1,5 +1,4 @@ ## GitLab -## Contributors: randx, yin8086, sashkab, orkoden, axilleas, bbodenmiller, DouweM ## ## Modified from nginx http version ## Modified from http://blog.phusion.nl/2012/04/21/tutorial-setting-up-gitlab-on-debian-6/ @@ -9,6 +8,13 @@ ## Lines starting with one hash (#) are configuration parameters that can be uncommented. ## ################################## +## CONTRIBUTING ## +################################## +## +## 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 +## +################################## ## CHUNKED TRANSFER ## ################################## ## |