gitlab-org--gitlab-foss/config
Grzegorz Bizon 44321b1a3d Merge branch 'master' into feature/multi-level-container-registry-images
* master: (57 commits)
  Ensure we generate unique usernames otherwise validations fail
  Fix a Knapsack issue that would load support/capybara.rb before support/env.rb
  Ensure users have a short username otherwise a click event is triggered ...
  Enable the `bullet_logger` setting; enable `raise` in test environment
  Fix Rubocop offenses
  Set the right timeout for Gitlab::Shell#fetch_remote
  Refactoring Projects::ImportService
  Move methods that are not related to mirroring to the repository model
  Fix GitHub pull request formatter spec
  Rename skip_metrics to imported on the importable concern
  Add CHANGELOG
  Remove unused include from RepositoryImportWorker
  Skip MR metrics when importing projects from GitHub
  Fetch GitHub project as a mirror to get all refs at once
  Make file templates easy to use and discover
  Ensure user has a unique username otherwise `user10` would match `user1`
  Ensure the AbuseReport fixtures create unique reported users
  Don't use FFaker in factories, use sequences instead
  Fix brittle specs
  Fix the AbuseReport seeder
  ...

Conflicts:
	db/schema.rb
2017-04-04 13:36:36 +02:00
..
environments Introduce a new middleware for the test environment that can block requests 2017-03-22 19:45:21 +01:00
initializers Enable the `bullet_logger` setting; enable `raise` in test environment 2017-04-03 17:15:09 -04:00
locales Implement OpenID Connect identity provider 2017-03-07 14:54:35 +01:00
routes Merge branch 'master' into feature/multi-level-container-registry-images 2017-04-04 13:36:36 +02:00
README.md Update wordings by feedback from: 2016-06-23 11:45:06 +08:00
application.rb Restore unicode-file-name images for legacy img emojis 2017-03-16 02:37:25 -05:00
aws.yml.example
boot.rb Enable the Rubocop DeprecatedClassMethods cop 2016-05-08 15:33:34 -06:00
database.yml.env
database.yml.mysql Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7 2017-01-12 22:32:55 +01:00
database.yml.postgresql
dependency_decisions.yml approve opener license (MIT) 2017-02-21 16:33:58 -06:00
environment.rb
gitlab.yml.example Add support for Gitaly calls over TCP connection 2017-04-03 18:45:36 +02:00
karma.config.js Only add frontend code coverage instrumentation when generating coverage report 2017-03-20 22:29:45 +00:00
license_finder.yml Resolve feedback. 2016-06-06 13:39:36 -06:00
mail_room.yml Use newer mail_room to get `require_relative` support 2017-02-20 17:38:21 +01:00
no_todos_messages.yml Improve consistency of empty todo list messages 2016-11-18 17:40:24 +02:00
resque.yml.example Added Redis Sentinel support documentation 2016-08-04 18:55:37 +02:00
routes.rb Implement OpenID Connect identity provider 2017-03-07 14:54:35 +01:00
secrets.yml.example
sidekiq.yml.example
sidekiq_queues.yml Moved call of SystemHooksService from UpdateMergeRequestsWorker to GitPushServic… 2017-03-07 12:59:20 +00:00
unicorn.rb.example Fix typos and grammar 2016-11-14 11:01:52 +00:00
unicorn.rb.example.development
webpack.config.js Merge branch 'ipython-notebook-viewer' into 'master' 2017-03-28 19:29:02 +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.