kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/config
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
application.rb Includes page specific JS 2016-11-16 11:57:51 +00: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 Remove 'socket' example PostgreSQL parameter 2014-07-01 18:27:50 +02:00
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 Add idle_timeout to reply by email doc. 2016-11-16 12:46:37 +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 Add nested groups support to the routing 2016-11-23 14:08:36 +02: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 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 Increase unicorn timeout to 60 seconds 2014-09-23 17:11:16 +03: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.