delta/gitlab/gitlab-ce.git, branch ce_upstream

Fix group hooks routing after merge conflicts

2016-11-09T14:18:48+00:00

Signed-off-by: Dmitriy Zaporozhets

Resolve global_search_spec.rb

2016-11-09T07:00:44+00:00

Fix merge conflicts on CE Upstream merge

2016-11-08T22:08:39+00:00

Merge remote-tracking branch 'ce/master' into ce_upstream

2016-11-08T18:13:57+00:00

Merge branch 'faster_project_search' into 'master'

2016-11-08T15:29:56+00:00


Faster search inside Project

See merge request !7353

Merge branch 'fix-new-branch-button-spec' into 'master'

2016-11-08T15:21:47+00:00


Fix new branch button spec

Closes #24089.

See merge request !7284

Merge branch 'dz-refactor-contraints' into 'master'

2016-11-08T15:01:38+00:00


Refactor routing constraints

## What does this MR do?

Refactors routing constraints

## Why was this MR needed?

This refactoring make it possible to introduce nesting namespaces and project constrainer in future. 

## What are the relevant issue numbers?

Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121/

See merge request !7327

Merge branch '24255-search-fix' into 'master'

2016-11-08T14:11:39+00:00


Fix broken commits search

## What does this MR do?

Fixes commits search



## What are the relevant issue numbers?


Closes #24255

See merge request !7339

Merge branch 'move-boards-interceptor' into 'master'

2016-11-08T14:00:34+00:00


Move Ajax interceptor into describe block

## What does this MR do?

Move registering the Vue resource interceptor for issue board mock data into the corresponding `describe` blocks.

## Why was this MR needed?

Currently, the interceptor is registered for every test (which makes them at best fail for Ajax calls using Vue resource).

See merge request !7304

Fix routing spec for group controller

2016-11-08T13:54:17+00:00

Signed-off-by: Dmitriy Zaporozhets