Commit 93e89bf4 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'ee-mj/config-readme-diff' into 'master'

Resolve config/README.md CE/EE diff

See merge request gitlab-org/gitlab-ee!14551
parents ea32496f 7b7eef35
# Configuration files Documentation
Note that most configuration files (`*.*`) committed into
Note that most configuration files (`config/*.*`) committed into
[gitlab-ce](https://gitlab.com/gitlab-org/gitlab-ce) **will not be used** for
[omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab). Configuration
files committed into gitlab-ce are only used for development.
......@@ -147,4 +147,3 @@ searched):
3. the configuration file pointed to by the
`GITLAB_REDIS_CONFIG_FILE` environment variable
4. the configuration file `resque.yml`
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment