gitlab-org--gitlab-foss/config
Lin Jen-Shin 6c72d8a219 Merge remote-tracking branch 'upstream/master' into rename-builds-controller
* upstream/master: (116 commits)
  Revert "Merge branch 'grpc-1.3.4' into 'master'"
  Return nil when looking up config for unknown LDAP provider
  Avoid crash when trying to parse string with invalid UTF-8 sequence
  Enable Gitaly by default in GitLab 9.3
  Don’t create comment on JIRA if link already exists
  Disable sub_group_issuables_spec.rb for mysql
  Fix math rendering on blob pages
  Add changelog
  Don't allow to pass a user to ProjectWiki#http_url_to_repo
  Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
  Fix bottom padding for build page
  Fix /unsubscribe slash command creating extra todos
  Fix omniauth-google-oauth2 dependencies in Gemfile.lock
  Update looks job log
  'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
  Fix spec for Members::AuthorizedDestroyService
  31616-add-uptime-of-gitlab-instance-in-admin-area
  Set head pipeline when creating merge requests
  Create a separate helper to check if we show particular tab on a search page
  Add performance deltas between app deployments on Merge Request widget
  ...
2017-05-31 18:14:11 +08:00
..
environments Merge branch '29421-production-config-assets-compile-false' into 'master' 2017-05-16 05:33:59 +00:00
initializers Merge remote-tracking branch 'upstream/master' into rename-builds-controller 2017-05-31 18:14:11 +08:00
locales
routes Use another scope to add the - prefix, feedback: 2017-05-31 16:56:00 +08:00
README.md
application.rb add rss_token attribute to user model 2017-05-24 22:29:59 +02:00
aws.yml.example
boot.rb
database.yml.env
database.yml.mysql
database.yml.postgresql
dependency_decisions.yml
environment.rb
gitlab.yml.example Enable Gitaly by default in GitLab 9.3 2017-05-30 16:09:44 +02:00
karma.config.js
license_finder.yml
mail_room.yml
no_todos_messages.yml
resque.yml.example
routes.rb Revert "Remove changes that are not absolutely necessary" 2017-05-24 20:59:26 +00:00
secrets.yml.example
sidekiq.yml.example
sidekiq_queues.yml Implement web hooks logging 2017-05-25 10:07:52 +03:00
unicorn.rb.example
unicorn.rb.example.development
webpack.config.js Merge branch '31849-pipeline-show-view-realtime' into 'master' 2017-05-30 07:48:13 +00:00

README.md

Configuration files Documentation

Note that most configuration files (config/*.*) committed into gitlab-ce will not be used for omnibus-gitlab. Configuration files committed into gitlab-ce are only used for development.

gitlab.yml

You can find most of GitLab configuration settings here.

mail_room.yml

This file is actually an YML wrapped inside an ERB file to enable templated values to be specified from gitlab.yml. mail_room loads this file first as an ERB file and then loads the resulting YML as its configuration.

resque.yml

This file is called resque.yml for historical reasons. We are NOT using Resque at the moment. It is used to specify Redis configuration values instead.