<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch fix-visible-content-spec-message</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Update outdated visible content spec descriptions</title>
<updated>2016-12-07T10:31:01+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-12-07T10:31:01+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=dec384cf23787e156eac8d633f70fb40479a5283'/>
<id>dec384cf23787e156eac8d633f70fb40479a5283</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 'patch-7' into 'master'</title>
<updated>2016-12-07T10:27:32+00:00</updated>
<author>
<name>Achilleas Pipinellis</name>
<email>axilleas@axilleas.me</email>
</author>
<published>2016-12-07T10:27:32+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9f8a389ac6c2065e8b4fdf174af18c93ba398d25'/>
<id>9f8a389ac6c2065e8b4fdf174af18c93ba398d25</id>
<content type='text'>

Update php.md - /.dockerinit was removed in v1.11 so the test always results in …

See merge request !7882</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update php.md - /.dockerinit was removed in v1.11 so the test always results in …

See merge request !7882</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'excoveralls_coverage' into 'master'</title>
<updated>2016-12-07T10:16:51+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-07T10:16:51+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=51d269f8b36fd8dd897e32f767af29f4eca3b1f6'/>
<id>51d269f8b36fd8dd897e32f767af29f4eca3b1f6</id>
<content type='text'>

Add excoveralls in list of coverage examples

See merge request !7906</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add excoveralls in list of coverage examples

See merge request !7906</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'patch-6' into 'master'</title>
<updated>2016-12-07T09:55:24+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-12-07T09:55:24+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c65a8552c756f46f44ba691eba4797860710e522'/>
<id>c65a8552c756f46f44ba691eba4797860710e522</id>
<content type='text'>

Update custom_hooks.md for chained hooks support

See merge request !6721</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update custom_hooks.md for chained hooks support

See merge request !6721</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'dz-fix-group-label-404' into 'master'</title>
<updated>2016-12-07T08:59:16+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-07T08:59:16+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=34fc5b050a4e70bf491be9a49cfa2dc0a7a9a9a2'/>
<id>34fc5b050a4e70bf491be9a49cfa2dc0a7a9a9a2</id>
<content type='text'>

Fix 404 error when visit group label edit page

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25158

See merge request !7957</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix 404 error when visit group label edit page

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25158

See merge request !7957</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'remove-has-visible-content-caching' into 'master'</title>
<updated>2016-12-07T00:52:18+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-12-07T00:52:18+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ff02c63cd3cfbaebb16ed770e377ae318c6be054'/>
<id>ff02c63cd3cfbaebb16ed770e377ae318c6be054</id>
<content type='text'>

Remove caching of Repository#has_visible_content?

This MR removes the caching of `Repository#has_visible_content?`. The cache for this method is no longer necessary and this should solve the problem described in https://gitlab.com/gitlab-org/gitlab-ce/issues/25278.

See merge request !7947</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Remove caching of Repository#has_visible_content?

This MR removes the caching of `Repository#has_visible_content?`. The cache for this method is no longer necessary and this should solve the problem described in https://gitlab.com/gitlab-org/gitlab-ce/issues/25278.

See merge request !7947</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'cleanup-7180' into 'master'</title>
<updated>2016-12-06T23:04:40+00:00</updated>
<author>
<name>Robert Schilling</name>
<email>rschilling@student.tugraz.at</email>
</author>
<published>2016-12-06T23:04:40+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=73a066c216815f6b4faf9b186b917c3486b6d6e0'/>
<id>73a066c216815f6b4faf9b186b917c3486b6d6e0</id>
<content type='text'>

A simpler implementation of finding a merge request

## What does this MR do?

This cleans up some code in the issues API as discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180#note_19501743

The helper method `merge_request_for_resolving_discussions` was no longer needed as it was only used once. That made it possible to simplify the implementation.

## Does this MR meet the acceptance criteria?

- [x] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
  - [ ] All builds are passing
- [x] 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)
- [x] Branch has no merge conflicts with `master` (if it does - 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?

!7180

See merge request !7955</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

A simpler implementation of finding a merge request

## What does this MR do?

This cleans up some code in the issues API as discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180#note_19501743

The helper method `merge_request_for_resolving_discussions` was no longer needed as it was only used once. That made it possible to simplify the implementation.

## Does this MR meet the acceptance criteria?

- [x] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
  - [ ] All builds are passing
- [x] 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)
- [x] Branch has no merge conflicts with `master` (if it does - 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?

!7180

See merge request !7955</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'remove-pages-css' into 'master'</title>
<updated>2016-12-06T22:43:38+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-12-06T22:43:38+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=180f87cab7c530852c049e130e9297267e006010'/>
<id>180f87cab7c530852c049e130e9297267e006010</id>
<content type='text'>

Remove more pages css

* Moves award emojis to `/framework`
* Moves generic image styles to `/framework`
* Removes `confirmation.scss`

See merge request !7952</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Remove more pages css

* Moves award emojis to `/framework`
* Moves generic image styles to `/framework`
* Removes `confirmation.scss`

See merge request !7952</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'remove-dashboard-css' into 'master'</title>
<updated>2016-12-06T20:42:39+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-12-06T20:42:39+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5ba6d5e7a25e3444772172ae8a487f4b4c18f052'/>
<id>5ba6d5e7a25e3444772172ae8a487f4b4c18f052</id>
<content type='text'>

Remove dashboard.scss

See merge request !7960</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Remove dashboard.scss

See merge request !7960</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into 'remove-pages-css'</title>
<updated>2016-12-06T20:41:02+00:00</updated>
<author>
<name>Annabel Dunstone Gray</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-12-06T20:41:02+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6886fab4aa7f6ddba27f1d7df591b1a6bfc27044'/>
<id>6886fab4aa7f6ddba27f1d7df591b1a6bfc27044</id>
<content type='text'>
# Conflicts:
#   app/assets/stylesheets/framework.scss</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#   app/assets/stylesheets/framework.scss</pre>
</div>
</content>
</entry>
</feed>
