gitlab-org--gitlab-foss/config
Sean McGivern 25709853cb Merge branch '24915_merge_slash_command' into 'master'
Support `/merge` slash command for MRs

Closes #24915

See merge request !7746
2017-01-17 16:10:43 +00:00
..
environments Remove quiet_assets in favor of built-in sprockets-rails config. 2016-06-30 16:18:05 -06:00
initializers Explain why there is a monkey-patch 2016-12-27 18:15:29 +01:00
locales Calls to the API are checked for scope. 2016-12-16 16:29:31 +05:30
routes refresh merge widget after using /merge command 2017-01-11 08:48:07 -05:00
application.rb change how pagination component is loaded 2017-01-15 00:11:12 -05:00
aws.yml.example Add a note that changing example configuration files requires changing omnibus-gitlab. 2015-06-11 15:11:37 +02:00
boot.rb Enable the Rubocop DeprecatedClassMethods cop 2016-05-08 15:33:34 -06:00
database.yml.env Improving the "Environment variables" administration doc 2016-02-01 19:10:46 +01:00
database.yml.mysql Added ability to put emojis into repository name 2016-11-12 09:21:23 +01:00
database.yml.postgresql
dependency_decisions.yml Blacklist the OSL 3.0 license 2016-10-28 12:05:46 +01:00
environment.rb Rails update to 4.2.4 2015-11-25 18:18:44 +02:00
gitlab.yml.example Merge branch 'zj-mattermost-slash-config' into 'master' 2016-12-21 14:59:41 +00:00
license_finder.yml Resolve feedback. 2016-06-06 13:39:36 -06:00
mail_room.yml Make mail_room idle_timeout option configurable. 2016-11-16 12:46:37 +01:00
newrelic.yml Revert "Remove newrelic gem. Closes #12860" 2016-02-23 07:25:37 -08:00
no_todos_messages.yml Improve consistency of empty todo list messages 2016-11-18 17:40:24 +02:00
README.md Update wordings by feedback from: 2016-06-23 11:45:06 +08:00
resque.yml.example Added Redis Sentinel support documentation 2016-08-04 18:55:37 +02:00
routes.rb Don't require API::API in routes 2016-12-12 18:17:21 +01:00
secrets.yml.example Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
sidekiq.yml.example bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this 2016-02-18 18:58:51 +00:00
sidekiq_queues.yml Record and show last used date of SSH Keys 2017-01-09 04:15:39 +11:00
unicorn.rb.example Fix typos and grammar 2016-11-14 11:01:52 +00:00
unicorn.rb.example.development

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.