delta/gitlab/gitlab-ce.git/spec, branch scope-input-errors

Update gl_field_error tests for better input filtering.

2016-10-20T10:47:32+00:00

Differentiate the expire from leave event

2016-10-20T00:26:45+00:00

At the moment we cannot see weather a user left a project due to their
membership expiring of if they themselves opted to leave the project.
This adds a new event type that allows us to make this differentiation.
Note that is not really feasable to go back and reliably fix up the
previous events. As a result the events for previous expire removals
will remain the same however events of this nature going forward will be
correctly represented.

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

Merge branch 'dz-refactor-project-members-controller-spec' into 'master'

2016-10-19T20:25:42+00:00


Refactor project_members_controller_spec

Make tests more readable, DRY and closer to RSpec best practices.

Same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6985 but for project_members_controller_spec now

See merge request !6989

Change the order of tested methods in project_members_controller_spec

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

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'issue_828' into 'master'

2016-10-19T19:01:55+00:00


Prevent wrong markdown on issue ids when project has Jira service activated

fixes gitlab-org/gitlab-ee#828

See merge request !6728

Merge branch '22457-reset-filters-button-should-be-invisible-when-no-filters-are-active' into 'master'

2016-10-19T17:39:31+00:00


`Reset filters` link should only be visible when filters are active

## Why was this MR needed?

`Reset filters` link is always visible.

Closes #22457

See merge request !6497

Avoid touch label links that does not belongs to project when moving it

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

Rename Labels::CreateService to Labels::FindOrCreateService

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

Update specs to cope with new label types and priorities

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

Fixed all related specs and also changed the logic to handle edge cases. This includes exporting and exporting of group labels, which will get associated with the new group (if any) or they will become normal project labels otherwise.

Found other issues to do with not being able to import all labels at once in the beginning of the JSON - code was much simpler when we import all labels and milestones associated to a project first, then the associations will find the already created labels instead of creating them from the associations themselves.