<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/services, branch docs-pages-force-https</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 'sync-merge-ref-upon-mergeability-check' into 'master'</title>
<updated>2019-06-24T09:31:46+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2019-06-24T09:31:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7821defab33f917b62d1132339a521d609f191d6'/>
<id>7821defab33f917b62d1132339a521d609f191d6</id>
<content type='text'>
Automatically update MR merge-ref along merge status

See merge request gitlab-org/gitlab-ce!29569</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Automatically update MR merge-ref along merge status

See merge request gitlab-org/gitlab-ce!29569</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '60617-enable-project-cluster-jit' into 'master'</title>
<updated>2019-06-24T05:16:31+00:00</updated>
<author>
<name>Thong Kuah</name>
<email>tkuah@gitlab.com</email>
</author>
<published>2019-06-24T05:16:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d9f4a919458721bd9ffae4d4e69bf17d18bd3be8'/>
<id>d9f4a919458721bd9ffae4d4e69bf17d18bd3be8</id>
<content type='text'>
Enable JIT Kubernetes resource creation for project level clusters

See merge request gitlab-org/gitlab-ce!29515</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Enable JIT Kubernetes resource creation for project level clusters

See merge request gitlab-org/gitlab-ce!29515</pre>
</div>
</content>
</entry>
<entry>
<title>Avoid touching the MR status if MR is not opened</title>
<updated>2019-06-21T14:30:09+00:00</updated>
<author>
<name>Oswaldo Ferreira</name>
<email>oswaldo@gitlab.com</email>
</author>
<published>2019-06-21T14:30:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=74a3e6b71254409d423077987f6961ea17ba00d9'/>
<id>74a3e6b71254409d423077987f6961ea17ba00d9</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 'bw-issue-reorder' into 'master'</title>
<updated>2019-06-21T13:11:43+00:00</updated>
<author>
<name>Kamil Trzciński</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2019-06-21T13:11:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8981966a1dff8b7eec5a04b03276ed24c08a72ec'/>
<id>8981966a1dff8b7eec5a04b03276ed24c08a72ec</id>
<content type='text'>
Add ability to reorder issues

See merge request gitlab-org/gitlab-ce!29012</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add ability to reorder issues

See merge request gitlab-org/gitlab-ce!29012</pre>
</div>
</content>
</entry>
<entry>
<title>Don't show private keys for letsencrypt certs</title>
<updated>2019-06-21T12:06:12+00:00</updated>
<author>
<name>Vladimir Shushlin</name>
<email>vshushlin@gitlab.com</email>
</author>
<published>2019-06-21T12:06:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6119d5ad7518f547af216d3bdc3d1fcffcfc9c71'/>
<id>6119d5ad7518f547af216d3bdc3d1fcffcfc9c71</id>
<content type='text'>
Adds enum certificate_source to pages_domains table
with default manually_uploaded

Mark certificates as 'gitlab_provided'
if the were obtained through Let's Encrypt

Mark certificates as 'user_provided' if they were uploaded through
controller or api

Only show private key in domain edit form if it is 'user_provided'

Only show LetsEncrypt option if is enabled by application settings
(and feature flag)

Refactor and fix some specs to match new logic

Don't show Let's Encrypt certificates as well
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Adds enum certificate_source to pages_domains table
with default manually_uploaded

Mark certificates as 'gitlab_provided'
if the were obtained through Let's Encrypt

Mark certificates as 'user_provided' if they were uploaded through
controller or api

Only show private key in domain edit form if it is 'user_provided'

Only show LetsEncrypt option if is enabled by application settings
(and feature flag)

Refactor and fix some specs to match new logic

Don't show Let's Encrypt certificates as well
</pre>
</div>
</content>
</entry>
<entry>
<title>Add reorder action to Project IssuesController</title>
<updated>2019-06-21T12:05:42+00:00</updated>
<author>
<name>Brett Walker</name>
<email>bwalker@gitlab.com</email>
</author>
<published>2019-06-01T01:19:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4a85e263b4afe2e1e64dcaf55856add6e7aed764'/>
<id>4a85e263b4afe2e1e64dcaf55856add6e7aed764</id>
<content type='text'>
to support manual sorting on the frontend
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
to support manual sorting on the frontend
</pre>
</div>
</content>
</entry>
<entry>
<title>Retry fetching Kubernetes Secret token</title>
<updated>2019-06-21T06:36:34+00:00</updated>
<author>
<name>Dylan Griffith</name>
<email>dyl.griffith@gmail.com</email>
</author>
<published>2019-06-21T05:13:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4855667dad5d1ff61725bebf0683f0491bffc87c'/>
<id>4855667dad5d1ff61725bebf0683f0491bffc87c</id>
<content type='text'>
Since Kubernetes is creating the Secret and token asynchronously it is
necessary that we implement some delay or retrying logic to avoid a race
condition where we fetch a Secret before the token is even set. There
does not appear to be any way for us to force it to be set with any
synchronous API call so retrying seems to be the only option.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Since Kubernetes is creating the Secret and token asynchronously it is
necessary that we implement some delay or retrying logic to avoid a race
condition where we fetch a Secret before the token is even set. There
does not appear to be any way for us to force it to be set with any
synchronous API call so retrying seems to be the only option.
</pre>
</div>
</content>
</entry>
<entry>
<title>Only force recheck when merge-ref is outdated</title>
<updated>2019-06-20T17:47:34+00:00</updated>
<author>
<name>Oswaldo Ferreira</name>
<email>oswaldo@gitlab.com</email>
</author>
<published>2019-06-20T17:38:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1f0b50c418c35a6a6978d148fdb5389fd2b3d0c7'/>
<id>1f0b50c418c35a6a6978d148fdb5389fd2b3d0c7</id>
<content type='text'>
When recheck flag is true, we make sure the merge-ref
is indeed outdated. If it is, we update it along
the merge status.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When recheck flag is true, we make sure the merge-ref
is indeed outdated. If it is, we update it along
the merge status.
</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>
<entry>
<title>Updating CE repo to include new EE users API changes</title>
<updated>2019-06-19T20:27:34+00:00</updated>
<author>
<name>Michael Leopard</name>
<email>mleopard@gitlab.com</email>
</author>
<published>2019-06-19T20:27:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8cf85b4bb50d0b116cb50699831f3ec049ae4ad4'/>
<id>8cf85b4bb50d0b116cb50699831f3ec049ae4ad4</id>
<content type='text'>
Updated users API documentation
Moved API level changes to the service level
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Updated users API documentation
Moved API level changes to the service level
</pre>
</div>
</content>
</entry>
</feed>
