<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/javascripts/vue_mr_widget, branch ab-structure-sql</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 'sh-fix-resolve-button-not-available' into 'master'</title>
<updated>2019-06-12T17:51:32+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2019-06-12T17:51:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d78a4465fafe6f0bb5e197649a0721f35a069bbd'/>
<id>d78a4465fafe6f0bb5e197649a0721f35a069bbd</id>
<content type='text'>
Fix "Resolve conflicts" button not appearing for some users

Closes #47954

See merge request gitlab-org/gitlab-ce!29535</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix "Resolve conflicts" button not appearing for some users

Closes #47954

See merge request gitlab-org/gitlab-ce!29535</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ce-remove-merge-request-pipeline-checkes' into 'master'</title>
<updated>2019-06-12T09:41:54+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2019-06-12T09:41:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d8f4779c7f7f0b75b89d7f48f8228c610b73c98a'/>
<id>d8f4779c7f7f0b75b89d7f48f8228c610b73c98a</id>
<content type='text'>
CE backport for gitlab-org/gitlab-ee!12309: Remove merge request pipeline check in mergeable method

See merge request gitlab-org/gitlab-ce!29074</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
CE backport for gitlab-org/gitlab-ee!12309: Remove merge request pipeline check in mergeable method

See merge request gitlab-org/gitlab-ce!29074</pre>
</div>
</content>
</entry>
<entry>
<title>Remove "target branch advanced" warning from FE code (CE)</title>
<updated>2019-06-12T08:23:34+00:00</updated>
<author>
<name>Nathan Friend</name>
<email>nathan@gitlab.com</email>
</author>
<published>2019-06-03T17:23:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=059b3e369ddea3cab03eccf3c1c18546a62b9c13'/>
<id>059b3e369ddea3cab03eccf3c1c18546a62b9c13</id>
<content type='text'>
Removes the "target branch advanced" warning from the frontend
as it is no longer needed due to the new merge trains feature.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Removes the "target branch advanced" warning from the frontend
as it is no longer needed due to the new merge trains feature.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix "Resolve conflicts" button not appearing for some users</title>
<updated>2019-06-12T06:18:30+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2019-06-12T06:05:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1405b9cd50ba956c866c41dfc5e7a6758e148d0c'/>
<id>1405b9cd50ba956c866c41dfc5e7a6758e148d0c</id>
<content type='text'>
Previously the frontend assumed that the user had to be able to merge to
that project in order to resolve conflicts. However, this is overly
restrictive, as the user only has to be able to push to the source
branch. In fact, appending the text /conflicts to the merge request
would bring up the conflict resolution page.

This confusion happens when a project contains a protected branch that
only allows maintainers to push. Users with Developer access no longer
have permission to merge, but they still can create branches in that
project.

To fix this issue, we now loosen the permission check for the "Resolve
conflicts" button and only check for access to push to the source
branch. This is consistent with what the backend does in
MergeRequests::Conflicts::ListService#can_be_resolved_by?.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Previously the frontend assumed that the user had to be able to merge to
that project in order to resolve conflicts. However, this is overly
restrictive, as the user only has to be able to push to the source
branch. In fact, appending the text /conflicts to the merge request
would bring up the conflict resolution page.

This confusion happens when a project contains a protected branch that
only allows maintainers to push. Users with Developer access no longer
have permission to merge, but they still can create branches in that
project.

To fix this issue, we now loosen the permission check for the "Resolve
conflicts" button and only check for access to push to the source
branch. This is consistent with what the backend does in
MergeRequests::Conflicts::ListService#can_be_resolved_by?.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
</pre>
</div>
</content>
</entry>
<entry>
<title>Add merge train support to MR merge button (CE)</title>
<updated>2019-06-11T14:27:51+00:00</updated>
<author>
<name>Nathan Friend</name>
<email>nathan@gitlab.com</email>
</author>
<published>2019-06-11T14:19:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=35ae9d8a7449ebe4b5c1878825bcb931a82e7a59'/>
<id>35ae9d8a7449ebe4b5c1878825bcb931a82e7a59</id>
<content type='text'>
This commit updates the merge request widget's "Merge" button to
support merge trains.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This commit updates the merge request widget's "Merge" button to
support merge trains.
</pre>
</div>
</content>
</entry>
<entry>
<title>FE: Remove legacy approval feature in MR files</title>
<updated>2019-06-04T08:57:30+00:00</updated>
<author>
<name>Paul Slaughter</name>
<email>pslaughter@gitlab.com</email>
</author>
<published>2019-05-30T22:39:42+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c1bb78a0ce232685fb18e13bf757b615aee0b75b'/>
<id>c1bb78a0ce232685fb18e13bf757b615aee0b75b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix frontend tests related to autoMergeStrategy</title>
<updated>2019-06-03T06:15:31+00:00</updated>
<author>
<name>Nathan Friend</name>
<email>nathan@gitlab.com</email>
</author>
<published>2019-05-30T16:47:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=84e550fad9c95dd19bb1739fc48ef6694c9f737d'/>
<id>84e550fad9c95dd19bb1739fc48ef6694c9f737d</id>
<content type='text'>
A few minor frontend changes to complete the refactoring
from MWPS to the more generic autoMergeStrategy.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
A few minor frontend changes to complete the refactoring
from MWPS to the more generic autoMergeStrategy.
</pre>
</div>
</content>
</entry>
<entry>
<title>Abstract auto merge processes</title>
<updated>2019-06-03T06:15:29+00:00</updated>
<author>
<name>Shinya Maeda</name>
<email>shinya@gitlab.com</email>
</author>
<published>2019-05-22T11:45:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d4b46936633a3b2a0248b4572b4a1dc7b2ba8531'/>
<id>d4b46936633a3b2a0248b4572b4a1dc7b2ba8531</id>
<content type='text'>
We have one auto merge strategy today - Merge When Pipeline
Succeeds.

In order to add more strategies for Merge Train feature,
we abstract the architecture to be more extensible.

Removed arguments

Fix spec
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
We have one auto merge strategy today - Merge When Pipeline
Succeeds.

In order to add more strategies for Merge Train feature,
we abstract the architecture to be more extensible.

Removed arguments

Fix spec
</pre>
</div>
</content>
</entry>
<entry>
<title>Add Pipeline IID to views</title>
<updated>2019-05-30T09:32:20+00:00</updated>
<author>
<name>Mike Scott</name>
<email>mike@homelyfe.com</email>
</author>
<published>2019-05-30T09:32:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=852738a4984edef4006a91b6b007a4c85fb3282e'/>
<id>852738a4984edef4006a91b6b007a4c85fb3282e</id>
<content type='text'>
* Add Pipeline IID to MR's
* Add Pipeline IID to commit box
* Add Pipeline IID to builds page
* Add Pipeline IID to job sidebar
* Add Pipeline IID to header on view pipeline pages
* Add changelog entry
* Update tests
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Add Pipeline IID to MR's
* Add Pipeline IID to commit box
* Add Pipeline IID to builds page
* Add Pipeline IID to job sidebar
* Add Pipeline IID to header on view pipeline pages
* Add changelog entry
* Update tests
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fe-rename-vue-component-helper-ce' into 'master'</title>
<updated>2019-05-20T20:06:34+00:00</updated>
<author>
<name>Mike Greiling</name>
<email>mike@pixelcog.com</email>
</author>
<published>2019-05-20T20:06:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=96725938c082e9f83c476da4dcb5d1e5b1863830'/>
<id>96725938c082e9f83c476da4dcb5d1e5b1863830</id>
<content type='text'>
[CE Port] Rename vue_component_helper to text_helper

See merge request gitlab-org/gitlab-ce!28358</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
[CE Port] Rename vue_component_helper to text_helper

See merge request gitlab-org/gitlab-ce!28358</pre>
</div>
</content>
</entry>
</feed>
