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
..
auth	Move logic to check ci? or lfs_deploy_token? to Gitlab::Auth::Result	2016-09-20 11:03:10 +02:00
backend	Refine Git garbage collection	2016-11-04 14:30:11 +01:00
badge
bitbucket_import	Rename gl_user_id to gitlab_user_id in importer classes	2016-09-08 11:57:22 +10:00
chat_commands	Issue creation now accepts trailing whitespace	2016-11-22 08:48:17 +01:00
checks	Avoid protected branches checks when verifying access without branch name	2016-09-13 11:50:13 +02:00
ci	Merge branch 'fix/ci-linter-undefined-error' into 'master'	2016-11-22 09:20:45 +00:00
conflict	Add blob_ace_mode to conflict content response	2016-10-13 14:16:35 -05:00
cycle_analytics	Fix and relevant spec for plan stage breaking with nil commits	2016-11-23 09:10:04 +01:00
data_builder	Fix lightweight tags not processed correctly by GitTagPushService	2016-10-28 13:53:18 -03:00
database	fixing spec failures	2016-11-17 08:22:55 +01:00
diff	Fix Error 500 when creating a merge request that contains an image that was deleted and added	2016-11-14 15:57:01 +01:00
downtime_check
email	fix indentation for rubocop	2016-11-17 11:59:44 +09:00
fogbugz_import	Pass user instance to Labels::FindOrCreateService or skip_authorization: true	2016-10-28 11:31:45 +02:00
gfm	Keep cross project reference logic in GroupLabel#to_reference	2016-10-19 14:58:26 -02:00
git	Clean environment variables when running git hooks	2016-09-15 08:51:55 +03:00
github_import	Refactor github import to reduce number of API calls	2016-11-18 07:47:00 +10:00
gitlab_import	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	2016-09-08 17:43:19 +03:00
google_code_import	Pass user instance to Labels::FindOrCreateService or skip_authorization: true	2016-10-28 11:31:45 +02:00
graphs
import_export	Merge branch 'fix/import-export-symlink-vulnerability' into 'security'	2016-11-03 16:04:18 +01:00
ldap	Centralize LDAP config/filter logic	2016-11-11 15:58:33 -06:00
markdown
metrics
middleware
o_auth	Omniauth auto link LDAP user falls back to find by DN when user cannot be found by uid	2016-11-10 15:47:40 -06:00
request_profiler
saml
sanitizers
sherlock
sidekiq_middleware	Merge branch 'aiionx_sidekiq_log_patch' into 'master'	2016-10-03 14:20:18 +00:00
slash_commands
sql
template
access.rb	Allow Member.add_user to handle access requesters	2016-09-28 09:43:00 +02:00
app_logger.rb
asciidoc.rb
auth.rb	Handle LFS token creation and retrieval in the same method, and in the same Redis connection.	2016-09-28 12:13:48 -05:00
award_emoji.rb
bitbucket_import.rb
blame.rb
changes_list.rb
chat_name_token.rb	Add most of specs for chat names	2016-11-17 21:34:23 +01:00
closing_issue_extractor.rb
color_schemes.rb
config_helper.rb
contributions_calendar.rb	Merge branch '23403-fix-events-for-private-project-features' into 'security'	2016-11-09 12:27:41 +01:00
contributor.rb
current_settings.rb	Only turn on Sidekiq throttling if application settings exists	2016-11-12 16:00:21 -08:00
database.rb	Precalculate user's authorized projects in database	2016-11-18 20:25:45 +02:00
devise_failure.rb
downtime_check.rb
ee_compat_check.rb	Ensure we sanitize branch names with path-unfriendly characters	2016-11-23 10:55:28 +01:00
emoji.rb	Convert UTF-8 Emoji to Gitlab emoji	2016-10-13 13:18:30 +02:00
environment_logger.rb	Show log corresponding to env in admin/logs	2016-11-03 22:02:47 +01:00
exclusive_lease.rb	Refine Git garbage collection	2016-11-04 14:30:11 +01:00
file_detector.rb	Unify detecting of special repository files	2016-11-21 12:51:40 +01:00
git.rb	Add spec covering 'committer_hash'	2016-09-20 10:15:43 -07:00
git_access.rb	Merge branch 'fix-unathorized-cloning' into 'security'	2016-11-09 12:27:17 +01:00
git_access_status.rb
git_access_wiki.rb
git_logger.rb
git_post_receive.rb
git_ref_validator.rb
gl_id.rb
gon_helper.rb	Stop putting private tokens in Gon	2016-09-19 12:27:37 +01:00
highlight.rb
identifier.rb	Use Commit#author so we share logic and cache	2016-11-24 02:33:55 +08:00
import_export.rb	Fix import/export labels to cope with project and group labels. Added relevant specs.	2016-10-19 14:58:25 -02:00
import_formatter.rb
import_sources.rb
incoming_email.rb	implements reset incoming email token on issues modal and account page,	2016-11-07 15:56:18 +00:00
issues_labels.rb	Pass user instance to Labels::FindOrCreateService or skip_authorization: true	2016-10-28 11:31:45 +02:00
key_fingerprint.rb
lazy.rb
lfs_token.rb	Fix race condition that can be triggered if the token expires right after we retrieve it, but before we can set the new expiry time.	2016-09-29 10:25:26 -05:00
logger.rb
mail_room.rb	Make mail_room idle_timeout option configurable.	2016-11-16 12:46:37 +01:00
markup_helper.rb
metrics.rb
optimistic_locking.rb	Make retry_lock to not be infinite	2016-10-27 12:34:35 +01:00
other_markup.rb
popen.rb	Fix Gitlab::Popen.popen thread-safety issue	2016-09-13 21:39:46 +02:00
project_search_results.rb	Search for a filename in a project	2016-11-16 14:25:54 +02:00
protocol_access.rb
recaptcha.rb
redis.rb	Updated mail_room and added sentinel support to Reply by Email	2016-10-26 05:02:47 +02:00
reference_extractor.rb
regex.rb	Add nested groups support to the routing	2016-11-23 14:08:36 +02:00
repository_check_logger.rb
request_profiler.rb
routing.rb
search_results.rb	Clean up search result classes	2016-09-06 10:12:55 +03:00
seeder.rb
sentry.rb
sherlock.rb
sidekiq_logger.rb
sidekiq_throttler.rb	Refactored Sidekiq Throttler and updated documentation	2016-11-11 11:14:58 -06:00
snippet_search_results.rb	Clean up search result classes	2016-09-06 10:12:55 +03:00
themes.rb
timeless.rb
upgrader.rb
uploads_transfer.rb
url_builder.rb
url_sanitizer.rb
user_access.rb
utils.rb	Fix project features default values	2016-11-01 11:03:56 -02:00
version_info.rb
visibility_level.rb
workhorse.rb	Explain the extra chmod	2016-09-26 14:21:39 +02:00