delta/gitlab/gitlab-ce.git/spec/features, branch scope-input-errors gitlab.com: gitlab-org/gitlab-ce.git Differentiate the expire from leave event 2016-10-20T00:26:45+00:00 Callum Dryden callum.dryden@rightscale.com 2016-10-06T15:19:27+00:00 9124310f2871117acaac98781be84c9fc016e2ad 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. 
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 Douwe Maan douwe@gitlab.com 2016-10-19T20:41:04+00:00 25ff16459c7e5b632278ee11a19a3930f91f44ec 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 

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 '22457-reset-filters-button-should-be-invisible-when-no-filters-are-active' into 'master' 2016-10-19T17:39:31+00:00 Robert Speicher robert@gitlab.com 2016-10-19T17:39:31+00:00 880530dab4e8f124f4618e3f427de0923d1091b4 `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 

`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
 Update specs to cope with new label types and priorities 2016-10-19T16:58:28+00:00 James Lopez james@jameslopez.es 2016-10-18T17:31:10+00:00 891e5f4851c2067daba12a1750651170a1583481 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. 
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.
Add support to group labels prioritization on project level 2016-10-19T16:58:27+00:00 Douglas Barbosa Alexandre dbalexandre@gmail.com 2016-10-14T21:32:44+00:00 67314e95ae836365fa1989439a6379aac781a0b4 






Fix import test
2016-10-19T16:58:25+00:00

James Lopez
james@jameslopez.es

2016-09-29T07:51:12+00:00

848a146fc3bd34ec94a206f2ed6ef33d539bfce5












Remove scopes/types for labels
2016-10-19T16:58:25+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-09-29T04:03:28+00:00

0bfa39d5bdb9f53bfc319b9351230b3eb405b619












Update project test file for project import integration test
2016-10-19T16:58:25+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-09-28T14:23:42+00:00

fd0ba37276f6246c4095c4879bf9e1186f7c5ad8












List group labels on project labels page
2016-10-19T16:58:24+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-09-20T03:09:57+00:00

bdb7bf4b5188ffd68e54cbf671ba9ce1a4ffb1d1












Merge branch 'sh-fix-broken-note-award-emoji' into 'master'

2016-10-19T09:55:29+00:00

Robert Speicher
robert@gitlab.com

2016-10-19T09:55:29+00:00

d22d8e8f4b8da299bcc34a051b254d0f69bb4cc4


Fix broken award emoji for comments

Closes #23506

See merge request !6967





Fix broken award emoji for comments

Closes #23506

See merge request !6967