<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/models/merge_request.rb, 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>Ensure metrics regardless of being imported on MRs</title>
<updated>2018-05-30T15:14:56+00:00</updated>
<author>
<name>Oswaldo Ferreira</name>
<email>oswaldo@gitlab.com</email>
</author>
<published>2018-05-30T15:14:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=db926729660d66098db717ae9f64fab0cd2f601f'/>
<id>db926729660d66098db717ae9f64fab0cd2f601f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add 'squash and rebase' feature to CE</title>
<updated>2018-05-29T09:51:43+00:00</updated>
<author>
<name>blackst0ne</name>
<email>blackst0ne.ru@gmail.com</email>
</author>
<published>2018-05-29T09:51:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4cff66a6c46361e8d775ea3f5a80bf147d4020b3'/>
<id>4cff66a6c46361e8d775ea3f5a80bf147d4020b3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Avoid race condition of re-triggering mark_as_unchecked</title>
<updated>2018-05-18T09:02:35+00:00</updated>
<author>
<name>Mark Chao</name>
<email>mchao@gitlab.com</email>
</author>
<published>2018-05-18T09:02:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b1ab1609b66f6cb47bb7d7b3babdd29cd0aae3c4'/>
<id>b1ab1609b66f6cb47bb7d7b3babdd29cd0aae3c4</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Create TODO when MR became unmergeable</title>
<updated>2018-05-17T00:54:57+00:00</updated>
<author>
<name>lulalala</name>
<email>mark@goodlife.tw</email>
</author>
<published>2018-05-09T09:55:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=953bb41f25270c07ab12c17472ef0fe8ab848301'/>
<id>953bb41f25270c07ab12c17472ef0fe8ab848301</id>
<content type='text'>
Old behavior of creating TODO when
“Merge When Pipeline Succeeds” service fails, is generalized to:

Create a TODO whenever MR became unmergeable
(and similar to notification, MR author and merge_user are both applicable)
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Old behavior of creating TODO when
“Merge When Pipeline Succeeds” service fails, is generalized to:

Create a TODO whenever MR became unmergeable
(and similar to notification, MR author and merge_user are both applicable)
</pre>
</div>
</content>
</entry>
<entry>
<title>Notify with email when merge request became unmergeable</title>
<updated>2018-05-17T00:54:51+00:00</updated>
<author>
<name>lulalala</name>
<email>mark@goodlife.tw</email>
</author>
<published>2018-05-09T09:49:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=dc174e9655267e89e1b7c63f8c9f4dac069069c7'/>
<id>dc174e9655267e89e1b7c63f8c9f4dac069069c7</id>
<content type='text'>
Display MR unmergeable reasons
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Display MR unmergeable reasons
</pre>
</div>
</content>
</entry>
<entry>
<title>Add MergeRequest#merge_participants</title>
<updated>2018-05-17T00:54:47+00:00</updated>
<author>
<name>lulalala</name>
<email>mark@goodlife.tw</email>
</author>
<published>2018-05-09T09:43:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=179a1ee7c669e758f8dc9fb5e9c8f2563012a6e1'/>
<id>179a1ee7c669e758f8dc9fb5e9c8f2563012a6e1</id>
<content type='text'>
For notifying via todo or email.</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
For notifying via todo or email.</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>Display merge commit SHA in merge widget after merge</title>
<updated>2018-05-07T17:09:47+00:00</updated>
<author>
<name>Oswaldo Ferreira</name>
<email>oswaldo@gitlab.com</email>
</author>
<published>2018-05-03T20:28:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3063225ca289e87c3f590e1722451a1c674e2ac9'/>
<id>3063225ca289e87c3f590e1722451a1c674e2ac9</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[Rails5] Fix params passed to MergeWorker</title>
<updated>2018-05-03T08:52:51+00:00</updated>
<author>
<name>blackst0ne</name>
<email>blackst0ne.ru@gmail.com</email>
</author>
<published>2018-05-03T08:52:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5a7fbb8d89404f27a4467db7f2c619cc56f91142'/>
<id>5a7fbb8d89404f27a4467db7f2c619cc56f91142</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Atomic internal ids for all models</title>
<updated>2018-04-20T14:00:15+00:00</updated>
<author>
<name>Andreas Brandl</name>
<email>abrandl@gitlab.com</email>
</author>
<published>2018-04-20T14:00:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9ea2fc85a3387e7bbb10558b3f2302f05abe5b64'/>
<id>9ea2fc85a3387e7bbb10558b3f2302f05abe5b64</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
