<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/changelogs, branch grapify-notes-api</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>Merge branch 'issue_23032' into 'master'</title>
<updated>2016-11-04T19:34:24+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-11-04T19:34:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d0b28cd0616e84861bc6f3ed7e0b6becb371a3f5'/>
<id>d0b28cd0616e84861bc6f3ed7e0b6becb371a3f5</id>
<content type='text'>

Allow to test JIRA service when project does not have repository

closes #23032

See merge request !7162</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Allow to test JIRA service when project does not have repository

closes #23032

See merge request !7162</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'show-status-from-branch' into 'master'</title>
<updated>2016-11-04T17:38:25+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-11-04T17:38:25+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=86b8fb4e7f376bdb70faf8ce99f34b6ec0fc8dc1'/>
<id>86b8fb4e7f376bdb70faf8ce99f34b6ec0fc8dc1</id>
<content type='text'>

Show pipeline status from branch and commit than only commit

Closes #23615

See merge request !7034</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Show pipeline status from branch and commit than only commit

Closes #23615

See merge request !7034</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master'</title>
<updated>2016-11-04T15:22:36+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-11-04T15:22:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d12e764744e3be11c7ed886fb454e09a4d1f57d6'/>
<id>d12e764744e3be11c7ed886fb454e09a4d1f57d6</id>
<content type='text'>

Add setting to only allow merge requests to be merged when all discussions are resolved

_Originally opened at !6385 by @rodolfoasantos._

- - -

## What does this MR do?
Based on #20968 this merge request adds setting only to allow merge requests to be merged when all discussions are resolved. 

## Are there points in the code the reviewer needs to double check?
Check if there are other points to add the resolved discussion setting

## Why was this MR needed?
Add the possibility to configure the project to only accept merge request when all discussions are resolved

## Screenshots

![only_allow_merge_if_all_discussions_are_resolved](/uploads/9388db9421da0214590ffab6fb29f985/only_allow_merge_if_all_discussions_are_resolved.png)

![only_allow_merge_if_all_discussions_are_resolved_msg](/uploads/b1bba0c72ad67d3a1b34718baa08526e/only_allow_merge_if_all_discussions_are_resolved_msg.png)

## 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
  - [ ] 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 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?

Closes #20968

See merge request !7125</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add setting to only allow merge requests to be merged when all discussions are resolved

_Originally opened at !6385 by @rodolfoasantos._

- - -

## What does this MR do?
Based on #20968 this merge request adds setting only to allow merge requests to be merged when all discussions are resolved. 

## Are there points in the code the reviewer needs to double check?
Check if there are other points to add the resolved discussion setting

## Why was this MR needed?
Add the possibility to configure the project to only accept merge request when all discussions are resolved

## Screenshots

![only_allow_merge_if_all_discussions_are_resolved](/uploads/9388db9421da0214590ffab6fb29f985/only_allow_merge_if_all_discussions_are_resolved.png)

![only_allow_merge_if_all_discussions_are_resolved_msg](/uploads/b1bba0c72ad67d3a1b34718baa08526e/only_allow_merge_if_all_discussions_are_resolved_msg.png)

## 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
  - [ ] 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 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?

Closes #20968

See merge request !7125</pre>
</div>
</content>
</entry>
<entry>
<title>Remove author according to the document</title>
<updated>2016-11-04T14:43:02+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2016-11-04T14:43:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b9b508ad055db7633e44178cb4a00ef934313b04'/>
<id>b9b508ad055db7633e44178cb4a00ef934313b04</id>
<content type='text'>
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/changelog.md
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/changelog.md
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'upstream/master' into show-status-from-branch</title>
<updated>2016-11-04T14:37:44+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2016-11-04T14:37:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fb9a0e5277f9825d7faf991c0600a7247b268fe8'/>
<id>fb9a0e5277f9825d7faf991c0600a7247b268fe8</id>
<content type='text'>
* upstream/master: (35 commits)
  Only skip group when it's actually a group in the "Share with group" select
  Fix: Todos Filter Shows All Users
  Fix: Guest sees some repository details and gets 404
  Move shared params to a helper
  GrapeDSL for project hooks
  Update commits.scss
  updated styling commit SHA on branches page + added to changelog
  change build list height to show 6,5 builds + improve padding of list, with first/last child selectors
  Ignore builds directory from eslint
  Add changelog entry
  Document multiple repository storage paths
  Allow multiple repository storage shards to be enabled, and automatically round-robin between them
  Cleaned up global namespace JS
  Add tip for using Chrome to run and debug teaspoon tests.
  Add CHANGELOG entry file
  Add jquery.timeago.js to application.js
  Update match-regex to fix filename convention
  Move jquery.timeago to vendor directory
  Change a bunch of doc links to either relative or https://docs.gitlab.com.
  Show log corresponding to env in admin/logs
  ...
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* upstream/master: (35 commits)
  Only skip group when it's actually a group in the "Share with group" select
  Fix: Todos Filter Shows All Users
  Fix: Guest sees some repository details and gets 404
  Move shared params to a helper
  GrapeDSL for project hooks
  Update commits.scss
  updated styling commit SHA on branches page + added to changelog
  change build list height to show 6,5 builds + improve padding of list, with first/last child selectors
  Ignore builds directory from eslint
  Add changelog entry
  Document multiple repository storage paths
  Allow multiple repository storage shards to be enabled, and automatically round-robin between them
  Cleaned up global namespace JS
  Add tip for using Chrome to run and debug teaspoon tests.
  Add CHANGELOG entry file
  Add jquery.timeago.js to application.js
  Update match-regex to fix filename convention
  Move jquery.timeago to vendor directory
  Change a bunch of doc links to either relative or https://docs.gitlab.com.
  Show log corresponding to env in admin/logs
  ...
</pre>
</div>
</content>
</entry>
<entry>
<title>Allow to test JIRA service when project does not have repository</title>
<updated>2016-11-04T14:24:17+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2016-10-27T21:20:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8c2143a0a7330768211b8a03a6693ac823679339'/>
<id>8c2143a0a7330768211b8a03a6693ac823679339</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 '22588-todos-filter-shows-all-users' into 'master'</title>
<updated>2016-11-04T14:19:14+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-11-04T14:19:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b2bbac8850a18ccc65880dc5c300d0b6d39ab258'/>
<id>b2bbac8850a18ccc65880dc5c300d0b6d39ab258</id>
<content type='text'>

Fix: Todos Filter Shows All Users

Closes #22588

See merge request !7258</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix: Todos Filter Shows All Users

Closes #22588

See merge request !7258</pre>
</div>
</content>
</entry>
<entry>
<title>Add setting to only allow merge requests to be merged when all discussions are resolved</title>
<updated>2016-11-04T13:58:40+00:00</updated>
<author>
<name>Rodolfo Santos</name>
<email>rodolfoasantos@gmail.com</email>
</author>
<published>2016-09-16T11:02:42+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1db9f826c16053e32a1d234bf40b2ca399779cdf'/>
<id>1db9f826c16053e32a1d234bf40b2ca399779cdf</id>
<content type='text'>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '23961-can-t-share-project-with-groups' into 'master'</title>
<updated>2016-11-04T13:46:21+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-11-04T13:46:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a3cc2f1e8dfcfb2f3e181fa570ed2ba245f9a069'/>
<id>a3cc2f1e8dfcfb2f3e181fa570ed2ba245f9a069</id>
<content type='text'>

Only skip group when it's actually a group in the "Share with group" select

Fixes #23961

See merge request !7262</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Only skip group when it's actually a group in the "Share with group" select

Fixes #23961

See merge request !7262</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '24056-guest-sees-some-project-details-and-gets-404' into 'master'</title>
<updated>2016-11-04T12:22:46+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-11-04T12:22:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=856ef3c303574f9c6554dddf34e6bae5cfa0d4dd'/>
<id>856ef3c303574f9c6554dddf34e6bae5cfa0d4dd</id>
<content type='text'>

Fix: Guest sees some repository details and gets 404

Closes #24056

See merge request !7222</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix: Guest sees some repository details and gets 404

Closes #24056

See merge request !7222</pre>
</div>
</content>
</entry>
</feed>
