<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/models/project_services, branch bootstrap-markdown-code-highlight</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>Add validation to webhook and service URLs to ensure they are not blocked because of SSRF</title>
<updated>2018-06-01T11:43:53+00:00</updated>
<author>
<name>Francisco Javier López</name>
<email>fjlopez@gitlab.com</email>
</author>
<published>2018-06-01T11:43:53+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=840f80d48b7d8363f171f6137cd9f1fbafb52bfc'/>
<id>840f80d48b7d8363f171f6137cd9f1fbafb52bfc</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 'mr-conflict-notification' into 'master'</title>
<updated>2018-05-24T08:49:54+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2018-05-24T08:49:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e97a87433b2f55b2f688771cbe47d627f49d4b44'/>
<id>e97a87433b2f55b2f688771cbe47d627f49d4b44</id>
<content type='text'>
MR unmergeable notification

See merge request gitlab-org/gitlab-ce!18042</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
MR unmergeable notification

See merge request gitlab-org/gitlab-ce!18042</pre>
</div>
</content>
</entry>
<entry>
<title>Resolve "Deprecate Gemnasium project service"</title>
<updated>2018-05-23T09:40:45+00:00</updated>
<author>
<name>Olivier Gonzalez</name>
<email>ogonzalez@gitlab.com</email>
</author>
<published>2018-05-23T09:40:45+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=40dd12c7758c90ad124e68bd549027eac1973fe6'/>
<id>40dd12c7758c90ad124e68bd549027eac1973fe6</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add cannot_be_merged_recheck merge_status</title>
<updated>2018-05-17T00:54:47+00:00</updated>
<author>
<name>lulalala</name>
<email>mark@goodlife.tw</email>
</author>
<published>2018-03-28T03:20:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7517105303c264484d8677c81268f9f43ecc5593'/>
<id>7517105303c264484d8677c81268f9f43ecc5593</id>
<content type='text'>
First, transitions between can_be_merged &amp; cannot_be_merged are removed,
as they are currently blocked in `check_if_can_be_merged`.
`can_be_merge` always returns to `unchecked` first,
before it can transition to `cannot_be_merged` (and vice versa).

We want to avoid repeated notification triggered by repeated transition
between `cannot_be_merged` &amp; `unchecked`.

So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
but as a mean to remember it’s from cannot_be_merged.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407

Since `unchecked` and `cannot_be_merged_recheck` both mean
“we are in the middle of checking if it is mergeable”,
quite often we need to see if merge_status is in either one of them,
so `check_state?` is added to achieve this.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
First, transitions between can_be_merged &amp; cannot_be_merged are removed,
as they are currently blocked in `check_if_can_be_merged`.
`can_be_merge` always returns to `unchecked` first,
before it can transition to `cannot_be_merged` (and vice versa).

We want to avoid repeated notification triggered by repeated transition
between `cannot_be_merged` &amp; `unchecked`.

So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
but as a mean to remember it’s from cannot_be_merged.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407

Since `unchecked` and `cannot_be_merged_recheck` both mean
“we are in the middle of checking if it is mergeable”,
quite often we need to see if merge_status is in either one of them,
so `check_state?` is added to achieve this.
</pre>
</div>
</content>
</entry>
<entry>
<title>Flowdock uses Gitaly, not Grit</title>
<updated>2018-04-23T06:00:24+00:00</updated>
<author>
<name>Zeger-Jan van de Weg</name>
<email>git@zjvandeweg.nl</email>
</author>
<published>2018-04-20T11:02:42+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=807b7a161d876e078b3f036465377da0c5de2a81'/>
<id>807b7a161d876e078b3f036465377da0c5de2a81</id>
<content type='text'>
Prior to this change, Flowdock used Grit to get the difference between
commits and post that to the remote service. This required direct path
access, which doesn't work with Gitaly.

Fixes gitlab-org/gitaly#1113
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Prior to this change, Flowdock used Grit to get the difference between
commits and post that to the remote service. This required direct path
access, which doesn't work with Gitaly.

Fixes gitlab-org/gitaly#1113
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6'</title>
<updated>2018-04-05T06:41:56+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2018-04-03T11:00:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=52967b107b7b2f1472b4c005f70f21346079cd95'/>
<id>52967b107b7b2f1472b4c005f70f21346079cd95</id>
<content type='text'>
[10.6] Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2366
# Conflicts:
#	app/helpers/services_helper.rb
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
[10.6] Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2366
# Conflicts:
#	app/helpers/services_helper.rb
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove some easy cases of 'path_to_repo' use</title>
<updated>2018-03-28T09:21:32+00:00</updated>
<author>
<name>Jacob Vosmaer (GitLab)</name>
<email>jacob@gitlab.com</email>
</author>
<published>2018-03-28T09:21:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c43e18fc495f66c4a96c9a72bdda72392fb0ea32'/>
<id>c43e18fc495f66c4a96c9a72bdda72392fb0ea32</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 'fj-15329-services-callbacks-ssrf' into 'security-10-6'</title>
<updated>2018-03-21T14:39:21+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2018-03-13T22:38:25+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=95ced3bb5fa52e166aa03ee592f63180601cbde7'/>
<id>95ced3bb5fa52e166aa03ee592f63180601cbde7</id>
<content type='text'>
Server Side Request Forgery in Services and Web Hooks

See merge request gitlab/gitlabhq!2337</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Server Side Request Forgery in Services and Web Hooks

See merge request gitlab/gitlabhq!2337</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'issue_25542' into 'master'</title>
<updated>2018-03-20T08:45:08+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2018-03-20T08:45:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=439c63365f196badda401be0f8517ec9a561b99a'/>
<id>439c63365f196badda401be0f8517ec9a561b99a</id>
<content type='text'>
Improve JIRA event descriptions

Closes #25542

See merge request gitlab-org/gitlab-ce!17811</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Improve JIRA event descriptions

Closes #25542

See merge request gitlab-org/gitlab-ce!17811</pre>
</div>
</content>
</entry>
<entry>
<title>Improve JIRA event descriptions</title>
<updated>2018-03-19T19:36:16+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2018-03-16T19:09:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2ee197086a87d22c9203c9a3642f9db6d40f54c4'/>
<id>2ee197086a87d22c9203c9a3642f9db6d40f54c4</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
