<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/assets, branch test-gitlab-git</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Merge branch 'label-flash' into 'master'</title>
<updated>2016-08-17T00:38:31+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-08-17T00:38:31+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1b338d59f641ce629cbecb839b64c9fd65561276'/>
<id>1b338d59f641ce629cbecb839b64c9fd65561276</id>
<content type='text'>

Fix error message for existing labels in right sidebar.

## What does this MR do?
Fixes flash notification in right sidebar, if we want to create an existing label.

## Are there points in the code the reviewer needs to double check?
Nope.

## Why was this MR needed?
Because it was broken.

## What are the relevant issue numbers?
Fixes #20117 

## Screenshots (if relevant)

#### Before
![https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png)

#### After
![Screen_Shot_2016-07-28_at_13.38.03](/uploads/1dca73bf4c1b14c0044952a5032d9325/Screen_Shot_2016-07-28_at_13.38.03.png)
![Screen_Shot_2016-07-28_at_13.41.18](/uploads/9b814f7f03d0314050659e1ac6ace290/Screen_Shot_2016-07-28_at_13.41.18.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)~~
- [ ] ~~API support added~~
- Tests
  - [ ] ~~Added for this feature/bug~~
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] 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)

See merge request !5546</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix error message for existing labels in right sidebar.

## What does this MR do?
Fixes flash notification in right sidebar, if we want to create an existing label.

## Are there points in the code the reviewer needs to double check?
Nope.

## Why was this MR needed?
Because it was broken.

## What are the relevant issue numbers?
Fixes #20117 

## Screenshots (if relevant)

#### Before
![https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png)

#### After
![Screen_Shot_2016-07-28_at_13.38.03](/uploads/1dca73bf4c1b14c0044952a5032d9325/Screen_Shot_2016-07-28_at_13.38.03.png)
![Screen_Shot_2016-07-28_at_13.41.18](/uploads/9b814f7f03d0314050659e1ac6ace290/Screen_Shot_2016-07-28_at_13.41.18.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)~~
- [ ] ~~API support added~~
- Tests
  - [ ] ~~Added for this feature/bug~~
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] 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)

See merge request !5546</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'no-comment-button-on-discussion-diffs' into 'master'</title>
<updated>2016-08-17T00:33:41+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-08-17T00:33:41+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=07189d7aed52e784adf4d625d94838b44668b28e'/>
<id>07189d7aed52e784adf4d625d94838b44668b28e</id>
<content type='text'>

Don't show comment button in gutter of diffs on MR discussion tab

When browsing to an MR, switching to the Changes tab, and switching back to the Discussions tab, the gutter of the diffs on that page would show the comment button on-hover, while it shouldn't, since comments on new lines can only be created from the Changes tab.

![Screen_Shot_2016-07-25_at_22.01.11](/uploads/6b044e1a3ecb34ddaa0af432833473aa/Screen_Shot_2016-07-25_at_22.01.11.png)

`8-10-stable` counterpart at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5493

See merge request !5492</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Don't show comment button in gutter of diffs on MR discussion tab

When browsing to an MR, switching to the Changes tab, and switching back to the Discussions tab, the gutter of the diffs on that page would show the comment button on-hover, while it shouldn't, since comments on new lines can only be created from the Changes tab.

![Screen_Shot_2016-07-25_at_22.01.11](/uploads/6b044e1a3ecb34ddaa0af432833473aa/Screen_Shot_2016-07-25_at_22.01.11.png)

`8-10-stable` counterpart at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5493

See merge request !5492</pre>
</div>
</content>
</entry>
<entry>
<title>Add hover state to todos (!5361)</title>
<updated>2016-08-16T21:34:23+00:00</updated>
<author>
<name>winniehell</name>
<email>git@winniehell.de</email>
</author>
<published>2016-07-20T12:01:29+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bd02aa193d890baf15fc18d67ac3d471333d0e1c'/>
<id>bd02aa193d890baf15fc18d67ac3d471333d0e1c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'project-desc-width' into 'master'</title>
<updated>2016-08-16T21:32:05+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-08-16T21:32:05+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7dde4ed26b27fb4524687cfc73c4bf765300bfa3'/>
<id>7dde4ed26b27fb4524687cfc73c4bf765300bfa3</id>
<content type='text'>

Changed project description width

## What does this MR do?

Changes the width of the project description to a max of `700px`

## What are the relevant issue numbers?

Closes #20020 

## Screenshots (if relevant)

![Screen_Shot_2016-07-21_at_12.51.59](/uploads/567f5b11553b45baa7fb07156e46b727/Screen_Shot_2016-07-21_at_12.51.59.png)

See merge request !5397</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Changed project description width

## What does this MR do?

Changes the width of the project description to a max of `700px`

## What are the relevant issue numbers?

Closes #20020 

## Screenshots (if relevant)

![Screen_Shot_2016-07-21_at_12.51.59](/uploads/567f5b11553b45baa7fb07156e46b727/Screen_Shot_2016-07-21_at_12.51.59.png)

See merge request !5397</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'file-content-highlight-line' into 'master'</title>
<updated>2016-08-16T20:36:31+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-08-16T20:36:31+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=86a8409eaf651f84e253307120e31b711c9d6c28'/>
<id>86a8409eaf651f84e253307120e31b711c9d6c28</id>
<content type='text'>

Highlight empty lines

## What does this MR do?

Rather than just highlight the text, file line highlighting now highlights the full line including empty lines

## What are the relevant issue numbers?

Closes #19484 

## Screenshots (if relevant)

![Screen_Shot_2016-07-05_at_13.52.31](/uploads/d3bddc918d731681465381e96c0aa2b0/Screen_Shot_2016-07-05_at_13.52.31.png)

See merge request !5092</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Highlight empty lines

## What does this MR do?

Rather than just highlight the text, file line highlighting now highlights the full line including empty lines

## What are the relevant issue numbers?

Closes #19484 

## Screenshots (if relevant)

![Screen_Shot_2016-07-05_at_13.52.31](/uploads/d3bddc918d731681465381e96c0aa2b0/Screen_Shot_2016-07-05_at_13.52.31.png)

See merge request !5092</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'issue_18656' into 'master'</title>
<updated>2016-08-16T19:32:41+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-08-16T19:32:41+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f7e08ad0de580e9f27ad5301542f2913c6bb2bff'/>
<id>f7e08ad0de580e9f27ad5301542f2913c6bb2bff</id>
<content type='text'>

Load issue templates from repository

part of #18656 


## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [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
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] 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)

See merge request !4981</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Load issue templates from repository

part of #18656 


## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [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
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] 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)

See merge request !4981</pre>
</div>
</content>
</entry>
<entry>
<title>Load issues and merge requests templates from repository</title>
<updated>2016-08-16T18:50:17+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2016-06-24T19:43:46+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=28726729452ef64270534806e75a9595ea1a659d'/>
<id>28726729452ef64270534806e75a9595ea1a659d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Backport changes from gitlab-org/gitlab-ee!581 to CE.</title>
<updated>2016-08-16T05:35:14+00:00</updated>
<author>
<name>Timothy Andrew</name>
<email>mail@timothyandrew.net</email>
</author>
<published>2016-08-16T05:09:13+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e805a6470031d942f7de604fdf7acfc7cf4f0b1a'/>
<id>e805a6470031d942f7de604fdf7acfc7cf4f0b1a</id>
<content type='text'>
!581 has a lot of changes that would cause merge conflicts if not
properly backported to CE. This commit/MR serves as a better
foundation for gitlab-org/gitlab-ee!581.

= Changes =

1. Move from `has_one {merge,push}_access_level` to `has_many`, with the
   `length` of the association limited to `1`. This is _effectively_ a
   `has_one` association, but should cause less conflicts with EE, which
   is set to `has_many`. This has a number of related changes in the
   views, specs, and factories.

2. Make `gon` variable loading more consistent (with EE!581) in the
   `ProtectedBranchesController`. Also use `::` to prefix the
   `ProtectedBranches` services, because this is required in EE.

3. Extract a `ProtectedBranchAccess` concern from the two access level
   models. This concern only has a single `humanize` method here, but
   will have more methods in EE.

4. Add `form_errors` to the protected branches creation form. This is
   not strictly required for EE compatibility, but was an oversight
   nonetheless.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
!581 has a lot of changes that would cause merge conflicts if not
properly backported to CE. This commit/MR serves as a better
foundation for gitlab-org/gitlab-ee!581.

= Changes =

1. Move from `has_one {merge,push}_access_level` to `has_many`, with the
   `length` of the association limited to `1`. This is _effectively_ a
   `has_one` association, but should cause less conflicts with EE, which
   is set to `has_many`. This has a number of related changes in the
   views, specs, and factories.

2. Make `gon` variable loading more consistent (with EE!581) in the
   `ProtectedBranchesController`. Also use `::` to prefix the
   `ProtectedBranches` services, because this is required in EE.

3. Extract a `ProtectedBranchAccess` concern from the two access level
   models. This concern only has a single `humanize` method here, but
   will have more methods in EE.

4. Add `form_errors` to the protected branches creation form. This is
   not strictly required for EE compatibility, but was an oversight
   nonetheless.
</pre>
</div>
</content>
</entry>
<entry>
<title>Allow `Issue` to be submitted as spam</title>
<updated>2016-08-15T18:18:15+00:00</updated>
<author>
<name>Patricio Cano</name>
<email>suprnova32@gmail.com</email>
</author>
<published>2016-08-02T21:21:57+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=96399a81cbb2e8a0f666241eeaff7cc784c26983'/>
<id>96399a81cbb2e8a0f666241eeaff7cc784c26983</id>
<content type='text'>
- Added controller actions as reusable concerns
- Added controller tests
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
- Added controller actions as reusable concerns
- Added controller tests
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'zj-deployment-status-on-mr' into 'master'</title>
<updated>2016-08-15T15:29:26+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-08-15T15:29:26+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=06e3bb9f232329674bdc162dc8f973a19b03f3c4'/>
<id>06e3bb9f232329674bdc162dc8f973a19b03f3c4</id>
<content type='text'>

Show deployment status on a MR view

## What are the relevant issue numbers?

Resolves #19571, one in the list of #19992

## Screenshots (if relevant)

external_url = nil
![Screen_Shot_2016-08-02_at_13.57.03](/uploads/20ea1587eea556c7a1acd0ff726a5bfb/Screen_Shot_2016-08-02_at_13.57.03.png)

external_url != nil
![Screen_Shot_2016-08-02_at_13.59.59](/uploads/0094b9ddece3f4bf76c83988840c096d/Screen_Shot_2016-08-02_at_13.59.59.png)

Note, the timings are weird between merging and deploying, that is because I did it in the wrong order.

## Does this MR meet the acceptance criteria?

- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing

See merge request !5622</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Show deployment status on a MR view

## What are the relevant issue numbers?

Resolves #19571, one in the list of #19992

## Screenshots (if relevant)

external_url = nil
![Screen_Shot_2016-08-02_at_13.57.03](/uploads/20ea1587eea556c7a1acd0ff726a5bfb/Screen_Shot_2016-08-02_at_13.57.03.png)

external_url != nil
![Screen_Shot_2016-08-02_at_13.59.59](/uploads/0094b9ddece3f4bf76c83988840c096d/Screen_Shot_2016-08-02_at_13.59.59.png)

Note, the timings are weird between merging and deploying, that is because I did it in the wrong order.

## Does this MR meet the acceptance criteria?

- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing

See merge request !5622</pre>
</div>
</content>
</entry>
</feed>
