diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-13 14:47:17 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-13 14:47:17 +0200 |
| commit | 87cd46c475c8d6f79abae1be786576f22369c711 (patch) | |
| tree | 9f7d76ae61b81f70d048276455c44f97589ccbc7 /config/gitlab.yml.example | |
| parent | 941cfd1fbd576c07d82e18d9d7b206fc8245244b (diff) | |
| parent | 59c735bd1efe13405a7cdc11d9617be09d599266 (diff) | |
| download | gitlab-ce-87cd46c475c8d6f79abae1be786576f22369c711.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 35c7c425a5a..56caee47c97 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -46,6 +46,15 @@ production: &base # # relative_url_root: /gitlab + # Trusted Proxies + # Customize if you have GitLab behind a reverse proxy which is running on a different machine. + # Add the IP address for your reverse proxy to the list, otherwise users will appear signed in from that address. + trusted_proxies: + # Examples: + #- 192.168.1.0/24 + #- 192.168.2.1 + #- 2001:0db8::/32 + # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') # user: git |