<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/lib, branch docs-trigger-variable</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Preserve note_type and position for notes from emails</title>
<updated>2016-10-20T08:18:53+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2016-10-20T08:16:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a4ef4244d4b9b54246f53bba5c02746542034da5'/>
<id>a4ef4244d4b9b54246f53bba5c02746542034da5</id>
<content type='text'>
Closes #23208
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #23208
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'feature/group-level-labels' into 'master'</title>
<updated>2016-10-19T20:41:04+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-10-19T20:41:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=25ff16459c7e5b632278ee11a19a3930f91f44ec'/>
<id>25ff16459c7e5b632278ee11a19a3930f91f44ec</id>
<content type='text'>

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</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

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</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'issue_828' into 'master'</title>
<updated>2016-10-19T19:01:55+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-10-19T19:01:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2c45b85aae9a47572bb49eafe1a5fd5f70ee4756'/>
<id>2c45b85aae9a47572bb49eafe1a5fd5f70ee4756</id>
<content type='text'>

Prevent wrong markdown on issue ids when project has Jira service activated

fixes gitlab-org/gitlab-ee#828

See merge request !6728</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Prevent wrong markdown on issue ids when project has Jira service activated

fixes gitlab-org/gitlab-ee#828

See merge request !6728</pre>
</div>
</content>
</entry>
<entry>
<title>Update specs to cope with new label types and priorities</title>
<updated>2016-10-19T16:58:28+00:00</updated>
<author>
<name>James Lopez</name>
<email>james@jameslopez.es</email>
</author>
<published>2016-10-18T17:31:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=891e5f4851c2067daba12a1750651170a1583481'/>
<id>891e5f4851c2067daba12a1750651170a1583481</id>
<content type='text'>
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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix GitHub importer spec</title>
<updated>2016-10-19T16:58:28+00:00</updated>
<author>
<name>Douglas Barbosa Alexandre</name>
<email>dbalexandre@gmail.com</email>
</author>
<published>2016-10-18T08:26:16+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f0ad0ceff5236f3ee5babee47bfec217a54c3b07'/>
<id>f0ad0ceff5236f3ee5babee47bfec217a54c3b07</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Reuse LabelsFinder on Issueable#add_labels_by_names</title>
<updated>2016-10-19T16:58:25+00:00</updated>
<author>
<name>Douglas Barbosa Alexandre</name>
<email>dbalexandre@gmail.com</email>
</author>
<published>2016-10-03T21:41:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7e11ca86fdb23c967c25b19735770f99f936b32c'/>
<id>7e11ca86fdb23c967c25b19735770f99f936b32c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fix rubocop warning</title>
<updated>2016-10-19T16:58:25+00:00</updated>
<author>
<name>James Lopez</name>
<email>james@jameslopez.es</email>
</author>
<published>2016-09-29T13:06:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=723e576782aefa339a4db8916908c7ebe5a92f48'/>
<id>723e576782aefa339a4db8916908c7ebe5a92f48</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix import/export labels to cope with project and group labels. Added relevant specs.</title>
<updated>2016-10-19T16:58:25+00:00</updated>
<author>
<name>James Lopez</name>
<email>james@jameslopez.es</email>
</author>
<published>2016-09-29T11:15:18+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=77b7bfd463bf57d38cb6aa30f277cd19ffbb6504'/>
<id>77b7bfd463bf57d38cb6aa30f277cd19ffbb6504</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Unfold references for group labels when moving issue to another project</title>
<updated>2016-10-19T16:58:25+00:00</updated>
<author>
<name>Douglas Barbosa Alexandre</name>
<email>dbalexandre@gmail.com</email>
</author>
<published>2016-09-29T03:21:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=07709c5576a06179c5365b0d7fe154c5f67ca7e5'/>
<id>07709c5576a06179c5365b0d7fe154c5f67ca7e5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add Label attributes: type, and group_id to safe model attributes</title>
<updated>2016-10-19T16:58:25+00:00</updated>
<author>
<name>Douglas Barbosa Alexandre</name>
<email>dbalexandre@gmail.com</email>
</author>
<published>2016-09-27T02:36:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e00c739f975672eaba474824436ec70d979e1fcc'/>
<id>e00c739f975672eaba474824436ec70d979e1fcc</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
