History

Douwe Maan a7a9db803b Merge branch 'dz-allow-nested-group-routing' into 'master' Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459		2016-11-24 04:31:54 +00:00
..
environments	Remove quiet_assets in favor of built-in sprockets-rails config.	2016-06-30 16:18:05 -06:00
initializers	Add logging for rack attack events	2016-11-18 15:05:22 -05:00
locales	Validate if project label title does not exist at group level	2016-10-19 14:58:24 -02:00
routes	Add nested groups support to the routing	2016-11-23 14:08:36 +02:00
README.md	…
application.rb	Includes page specific JS	2016-11-16 11:57:51 +00: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
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.