delta/gitlab/gitlab-ce.git, branch fix-uncheckable-label-for-force_remove_source_branch

Clicking "force remove source branch" label now toggles the checkbox again

2016-11-08T14:07:58+00:00

Signed-off-by: Rémy Coutable

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

Merge branch 'dz-refactor-project-routes' into 'master'

2016-11-08T13:04:02+00:00


Refactor project routing

## What does this MR do?

Refactor project routing: 

* split on multiple files
* improve routing order


## Why was this MR needed?

It makes it easier to maintain and modify project routing

## What are the relevant issue numbers?

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

See merge request !7329

Merge branch 'dz-refactor-namespace-regex' into 'master'

2016-11-08T12:51:51+00:00


Refactor namespace regex

Reuse existing namespace regex constant in routing

See merge request !7336

Merge branch 'sidekiq_default_retries' into 'master'

2016-11-08T12:37:10+00:00


Set default Sidekiq retries to 3

See merge request !7294

Merge branch 'dz-refactor-group-routes' into 'master'

2016-11-08T12:37:00+00:00


Refactor group routing

## What does this MR do?

Refactor group routing: 
* separate controller actions from nested resources
* prepare group routing for nested namespaces support

## Why was this MR needed?

So when we introduce nested groups support we need to only change `:id` to `*id`

## What are the relevant issue numbers?

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

See merge request !7328

Merge branch 'sh-bump-omniauth-gitlab' into 'master'

2016-11-08T10:48:38+00:00


Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2

As noted in gitlab-com/support-forum#1270, omniauth-gitlab fails if omniauth-oauth2 is bumped to 1.4.0, OAuth2 quietly fails due to https://github.com/linchus/omniauth-gitlab/issues/10:

```
21:26:04 rails-web.1             | I, [2016-11-07T21:26:04.245007 #56637]  INFO -- omniauth: (gitlab) Callback phase initiated.
21:26:05 rails-web.1             | E, [2016-11-07T21:26:05.068009 #56637] ERROR -- omniauth: (gitlab) Authentication failure! invalid_credentials: OAuth2::Error, invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
```

This was fixed and discussed here: 
* https://github.com/linchus/omniauth-gitlab/commit/26c47e55396205fab8439363c98136d0fde797f3
* https://github.com/linchus/omniauth-gitlab/issues/10

Bumping this version to 1.0.2 will ensure future compatibility.

See merge request !7348

Merge branch 'use-separate-token-for-incoming-email' into 'master'

2016-11-08T10:47:45+00:00


Use separate email-friendly token for incoming email

See merge request !5914

Merge branch 'todos-filter-empty-state' into 'master'

2016-11-08T10:34:44+00:00


Fixed todos empty state when filtering

Closes #24127

See merge request !7334

Merge branch 'dz-fix-project-index' into 'master'

2016-11-08T10:22:55+00:00


Fix project index page

See merge request !7331