<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/doc/api/merge_requests.md, branch docs/split-autodevops-variable-table</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>Rewrite to avoid square brackets, minimizing Kramdown warnings</title>
<updated>2019-07-16T07:29:48+00:00</updated>
<author>
<name>Evan Read</name>
<email>eread@gitlab.com</email>
</author>
<published>2019-07-16T07:29:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=11b10d901ef4311cad5ff9c02f693525f710716d'/>
<id>11b10d901ef4311cad5ff9c02f693525f710716d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add blank lines around code blocks</title>
<updated>2019-07-12T08:09:23+00:00</updated>
<author>
<name>Marcel Amirault</name>
<email>mamirault@gitlab.com</email>
</author>
<published>2019-07-12T08:09:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c6f943db44ea7f5d3da4e9b638ccba1c09b501cf'/>
<id>c6f943db44ea7f5d3da4e9b638ccba1c09b501cf</id>
<content type='text'>
All code blocks should be surrounded by blank lines
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
All code blocks should be surrounded by blank lines
</pre>
</div>
</content>
</entry>
<entry>
<title>Changing badges to use parentheses not brackets</title>
<updated>2019-07-08T08:50:38+00:00</updated>
<author>
<name>Marcel Amirault</name>
<email>mamirault@gitlab.com</email>
</author>
<published>2019-07-08T08:50:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=73c6477b7e07dbdeb86f0c9033e84d7fda2ac0e2'/>
<id>73c6477b7e07dbdeb86f0c9033e84d7fda2ac0e2</id>
<content type='text'>
Previously, we used brackets to denote the tier badges,
but this made Kramdown, the docs site Markdown renderer,
show many warnings when building the site. This is now
fixed by using parentheses instead of square brackets.

This was caused by [PREMIUM] looking like a link to
Kramdown, which couldn't find a URL there.

See:
- https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/484
- https://gitlab.com/gitlab-org/gitlab-ce/issues/63800
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Previously, we used brackets to denote the tier badges,
but this made Kramdown, the docs site Markdown renderer,
show many warnings when building the site. This is now
fixed by using parentheses instead of square brackets.

This was caused by [PREMIUM] looking like a link to
Kramdown, which couldn't find a URL there.

See:
- https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/484
- https://gitlab.com/gitlab-org/gitlab-ce/issues/63800
</pre>
</div>
</content>
</entry>
<entry>
<title>Small markdown tweaks to clear kramdown warnings</title>
<updated>2019-07-04T22:46:12+00:00</updated>
<author>
<name>Marcel Amirault</name>
<email>mamirault@gitlab.com</email>
</author>
<published>2019-07-04T22:46:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e108f0d9610d0e019791920bb5adbc0b493d7b74'/>
<id>e108f0d9610d0e019791920bb5adbc0b493d7b74</id>
<content type='text'>
Fixing square brackets, links, etc in:
  merge_requests.md
  vulnerabilities.md
  issues.md
  issues_statistics.md
  pipelines.md
  services.md
  group_milestones.md
  milestones.md
  runners.md
  changelog.md
  issue_workflow.md
  elasticsearch.md
  api_graphql_styleguide.md
  automatic_ce_ee_merge.md
  file_storage.md
  architecture.md
  database_debugging.md
  index.md
  index.md
  frontend_testing.md
  pry_debugging.md
  vue.md
  development_process.md
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fixing square brackets, links, etc in:
  merge_requests.md
  vulnerabilities.md
  issues.md
  issues_statistics.md
  pipelines.md
  services.md
  group_milestones.md
  milestones.md
  runners.md
  changelog.md
  issue_workflow.md
  elasticsearch.md
  api_graphql_styleguide.md
  automatic_ce_ee_merge.md
  file_storage.md
  architecture.md
  database_debugging.md
  index.md
  index.md
  frontend_testing.md
  pry_debugging.md
  vue.md
  development_process.md
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '54117-transactional-rebase' into 'master'</title>
<updated>2019-07-04T16:30:40+00:00</updated>
<author>
<name>Douglas Barbosa Alexandre</name>
<email>dbalexandre@gmail.com</email>
</author>
<published>2019-07-04T16:30:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=eaa6edbff3dd6bc888d975bb1eb9b52f045930fa'/>
<id>eaa6edbff3dd6bc888d975bb1eb9b52f045930fa</id>
<content type='text'>
Allow asynchronous rebase operations to be monitored

Closes #54117

See merge request gitlab-org/gitlab-ce!29940</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Allow asynchronous rebase operations to be monitored

Closes #54117

See merge request gitlab-org/gitlab-ce!29940</pre>
</div>
</content>
</entry>
<entry>
<title>Clean up EE api docs that were merged to CE</title>
<updated>2019-07-04T08:22:41+00:00</updated>
<author>
<name>Marcel Amirault</name>
<email>mamirault@gitlab.com</email>
</author>
<published>2019-07-04T08:22:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8ac2c3ef434db3b6437811b7a198a086cd155a38'/>
<id>8ac2c3ef434db3b6437811b7a198a086cd155a38</id>
<content type='text'>
Many small fixes to api docs which were merged from EE to CE,
and tables cleaned up, as noted in issue
https://gitlab.com/gitlab-org/gitlab-ce/issues/64072
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Many small fixes to api docs which were merged from EE to CE,
and tables cleaned up, as noted in issue
https://gitlab.com/gitlab-org/gitlab-ce/issues/64072
</pre>
</div>
</content>
</entry>
<entry>
<title>Allow asynchronous rebase operations to be monitored</title>
<updated>2019-07-04T07:50:55+00:00</updated>
<author>
<name>Nick Thomas</name>
<email>nick@gitlab.com</email>
</author>
<published>2019-06-21T16:56:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=381468d0cc6e5b528a4b2207c0a534569035a73f'/>
<id>381468d0cc6e5b528a4b2207c0a534569035a73f</id>
<content type='text'>
This MR introduces tracking of the `rebase_jid` for merge requests. As
with `merge_ongoing?`, `rebase_in_progress?` will now return true if a
rebase is proceeding in sidekiq.

After one release, we should remove the Gitaly-based lookup of rebases.
It is much better to track this kind of thing via the database.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This MR introduces tracking of the `rebase_jid` for merge requests. As
with `merge_ongoing?`, `rebase_in_progress?` will now return true if a
rebase is proceeding in sidekiq.

After one release, we should remove the Gitaly-based lookup of rebases.
It is much better to track this kind of thing via the database.
</pre>
</div>
</content>
</entry>
<entry>
<title>Update api docs to finish aligning EE and CE docs</title>
<updated>2019-07-03T09:32:54+00:00</updated>
<author>
<name>Marcel Amirault</name>
<email>mamirault@gitlab.com</email>
</author>
<published>2019-07-03T09:32:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a347d159724380e3d3e38a672c36ec22f27ed896'/>
<id>a347d159724380e3d3e38a672c36ec22f27ed896</id>
<content type='text'>
Squashing a few commits and continuing work
on merging the 12 api docs that have not
been ported to CE yet.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Squashing a few commits and continuing work
on merging the 12 api docs that have not
been ported to CE yet.
</pre>
</div>
</content>
</entry>
<entry>
<title>Replace 'JIRA' with 'Jira'</title>
<updated>2019-06-28T13:25:56+00:00</updated>
<author>
<name>Takuya Noguchi</name>
<email>takninnovationresearch@gmail.com</email>
</author>
<published>2019-06-28T13:25:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=af5da7564edab1d3f2457e13e3157f2806b0b9a0'/>
<id>af5da7564edab1d3f2457e13e3157f2806b0b9a0</id>
<content type='text'>
https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163

Signed-off-by: Takuya Noguchi &lt;takninnovationresearch@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163

Signed-off-by: Takuya Noguchi &lt;takninnovationresearch@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Automatically update MR merge-ref along merge status</title>
<updated>2019-06-20T14:48:30+00:00</updated>
<author>
<name>Oswaldo Ferreira</name>
<email>oswaldo@gitlab.com</email>
</author>
<published>2019-05-21T21:14:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3af348b6cf28ef1d9d3025f7012049132b57798c'/>
<id>3af348b6cf28ef1d9d3025f7012049132b57798c</id>
<content type='text'>
This couples the code that transitions the `MergeRequest#merge_status`
and refs/merge-requests/:iid/merge ref update.

In general, instead of directly telling `MergeToRefService` to update
the merge ref, we should rely on `MergeabilityCheckService` to keep
both the merge status and merge ref synced. Now, if the merge_status is
`can_be_merged` it means the merge-ref is also updated to the latest.

We've also updated the logic to be more systematic and less user-based.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This couples the code that transitions the `MergeRequest#merge_status`
and refs/merge-requests/:iid/merge ref update.

In general, instead of directly telling `MergeToRefService` to update
the merge ref, we should rely on `MergeabilityCheckService` to keep
both the merge status and merge ref synced. Now, if the merge_status is
`can_be_merged` it means the merge-ref is also updated to the latest.

We've also updated the logic to be more systematic and less user-based.
</pre>
</div>
</content>
</entry>
</feed>
