delta/gitlab/gitlab-ce.git/spec/controllers, branch docs-trigger-variable

Fix status code expectation

2016-10-22T11:46:23+00:00

Signed-off-by: Rémy Coutable

Fix error in generating labels

2016-10-22T09:16:21+00:00

Attempting to generate default set of labels would result in
an error:

ArgumentError: wrong number of arguments (given 1, expected 0)

Closes #23649

Merge branch 'fix_project_member_access_levels' into 'master'

2016-10-21T12:51:44+00:00


Fix project member access levels

Migrate invalid project members (owner -> master)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18616

See merge request !6957

Fix project member access levels

2016-10-21T09:57:53+00:00

Merge branch 'zj-use-iid-deployment-refs' into 'master'

2016-10-20T17:55:38+00:00


Use iid deployment refs

This fixes the 404, because `find_by` will return nil instead of throwing an error.

See merge request !7021

Use deployment IID when saving refs

2016-10-20T12:17:22+00:00

Merge branch 'feature/group-level-labels' into 'master'

2016-10-19T20:41:04+00:00


Add group level labels

## What does this MR do?

Add group level labels.

## Are there points in the code the reviewer needs to double check?

* `LabelsFinder`
* `Gitlab::Gfm::ReferenceRewriter`
* `Banzai::Filter::LabelReferenceFilter`

## Why was this MR needed?

We'll be adding more feature that allow you to do cross-project management of issues.

## Screenshots (if relevant)

* Group Labels
    ![Group Labels](/uploads/2244c06ad68eae4fb246fb4c81bf8060/2.png)

* Project Labels
    ![Project Labels](/uploads/c5839516d2282b51f7418d9dadbeceb4/1.png)

* Expanded references for group labels when moving issue to another project
    ![Expanded references for group labels when moving issue to another project](/uploads/0c9ab248a8420d4978d59349ae3d42e5/3.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [ ] 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)
- [ ] Branch has no merge conflicts with `master` (if you do - 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?

#19997

See merge request !6425

Change the order of tested methods in project_members_controller_spec

2016-10-19T19:14:57+00:00

Signed-off-by: Dmitriy Zaporozhets

Fix sorting by label priorities

2016-10-19T16:58:27+00:00

Remove scopes/types for labels

2016-10-19T16:58:25+00:00