kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/config
History
Grzegorz Bizon 3deaf1342e Merge branch 'master' into auto-pipelines-vue 
* master: (367 commits)
  Set “Remove branch” button to default size
  remove unused helper method
  reduce common code even further to satisfy rake flay
  remove button class size alteration from revert and cherry pick links
  factor out common code to satisfy rake flay
  homogenize revert and cherry-pick button styles generated by commits_helper
  apply margin on alert banners only when there is one or more alerts
  Rename MattermostNotificationService back to MattermostService
  Rename SlackNotificationService back to SlackService
  Fix stage and pipeline specs and rubocop offenses
  Added QueryRecorder to test N+1 fix on Milestone#show
  Use gitlab-workhorse 1.2.1
  Make 'unmarked as WIP' message more consistent
  Improve specs for Files API
  Allow unauthenticated access to Repositories Files API GET endpoints
  Add isolated view spec for pipeline stage partial
  Move test for HTML stage endpoint to controller specs
  Fix sizing of avatar circles; add border
  Fix broken test
  Fix broken test Changes after review
  ...

Conflicts:
	app/assets/stylesheets/pages/pipelines.scss
	app/controllers/projects/pipelines_controller.rb
	app/views/projects/pipelines/index.html.haml
	spec/features/projects/pipelines/pipelines_spec.rb
2016-12-21 12:09:06 +01:00
..
environments Remove quiet_assets in favor of built-in sprockets-rails config. 2016-06-30 16:18:05 -06:00
initializers Rename Gogs to Gitea, DRY the controller and improve views 2016-12-19 17:35:51 +01:00
locales Calls to the API are checked for scope. 2016-12-16 16:29:31 +05:30
routes Merge branch '19703-direct-link-pipelines' into 'master' 2016-12-20 21:21:52 +00:00
application.rb Merge branch 'master' into auto-pipelines-vue 2016-12-21 12:09:06 +01: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 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 Store mattermost_url in settings 2016-12-17 10:31:14 +01: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
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 Add a ReactiveCaching concern for use in the KubernetesService 2016-12-19 19:53:03 +00: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.