kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/config
History
Grzegorz Bizon 0f40ae5f18 Merge branch 'master' into auto-pipelines-vue 
* master: (76 commits)
  Update "Installation from source" guide for 8.15.0
  Group links spec update
  Updates the font weight of button styles because of the change to system fonts
  Refactor SSH keys docs
  Improvements to setting up ssh
  Do not reload diff for merge request made from fork when target branch in fork is updated
  Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items
  Changes after review
  Fix broken test
  Adds CHANGELOG entry
  Adds tests
  Uniformize props name format
  Replace commit icon svg logic
  Replace play icon svg logic
  Updated JS based on review Fixed group links dropdown to match
  Update docs to reflect new defaults on omnibus
  Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'
  Merge branch 'html-safe-diff-line-content' into 'security'
  Merge branch 'rs-filter-authentication_token' into 'security'
  Merge branch 'destroy-session' into 'security'
  ...

Conflicts:
	app/models/ci/pipeline.rb
	app/models/commit_status.rb
	app/views/projects/ci/pipelines/_pipeline.html.haml
	app/views/projects/commit/_pipeline.html.haml
	app/views/projects/pipelines/_with_tabs.html.haml
	app/views/projects/pipelines/index.html.haml
	lib/api/helpers.rb
2016-12-09 20:30:39 +01:00
..
environments
initializers Merge branch 'rs-filter-authentication_token' into 'security' 2016-12-08 21:23:09 -03:00
locales Validate if project label title does not exist at group level 2016-10-19 14:58:24 -02:00
routes Fix 404 error when visit group label edit page 2016-12-06 18:50:48 +02:00
application.rb Merge branch 'master' into auto-pipelines-vue 2016-12-09 20:30:39 +01:00
aws.yml.example
boot.rb
database.yml.env
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
gitlab.yml.example Add idle_timeout to reply by email doc. 2016-11-16 12:46:37 +01:00
license_finder.yml
mail_room.yml Make mail_room idle_timeout option configurable. 2016-11-16 12:46:37 +01:00
newrelic.yml
no_todos_messages.yml Improve consistency of empty todo list messages 2016-11-18 17:40:24 +02:00
README.md
resque.yml.example Added Redis Sentinel support documentation 2016-08-04 18:55:37 +02:00
routes.rb Add nested groups support to the routing 2016-11-23 14:08:36 +02:00
secrets.yml.example
sidekiq.yml.example
sidekiq_queues.yml Precalculate user's authorized projects in database 2016-11-18 20:25:45 +02:00
unicorn.rb.example Fix typos and grammar 2016-11-14 11:01:52 +00:00
unicorn.rb.example.development

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.