<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/lib, branch api-project-upload</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>DRY up upload and download services</title>
<updated>2016-01-08T16:38:53+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-01-08T16:38:53+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0614793b38db4711053cbcb4fa80d9c8cc492eec'/>
<id>0614793b38db4711053cbcb4fa80d9c8cc492eec</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Satisfy Rubocp</title>
<updated>2016-01-07T12:37:59+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-01-07T12:37:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=706d7eb0b7a1d54604a11e1202e44069c6acccee'/>
<id>706d7eb0b7a1d54604a11e1202e44069c6acccee</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add API project upload endpoint</title>
<updated>2016-01-07T12:37:14+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-01-07T12:37:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1886d727f738895bb552151d59d4024f405522e2'/>
<id>1886d727f738895bb552151d59d4024f405522e2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Store SQL/view timings in milliseconds"</title>
<updated>2016-01-07T10:47:06+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-01-07T10:47:06+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7ed3a5a240e4997b24d11b96e27126dfaa575abe'/>
<id>7ed3a5a240e4997b24d11b96e27126dfaa575abe</id>
<content type='text'>
This reverts commit 7549102bb727daecc51da84af39956b32fc41537.

Apparently I was wrong about
ActiveSupport::Notifications::Event#duration returning the duration in
seconds, instead it returns it in milliseconds already.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit 7549102bb727daecc51da84af39956b32fc41537.

Apparently I was wrong about
ActiveSupport::Notifications::Event#duration returning the duration in
seconds, instead it returns it in milliseconds already.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'remove-influxdb-credentials' into 'master'</title>
<updated>2016-01-07T09:12:08+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-01-07T09:12:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ee9432a79a9e3599f162a9a8eb1fcc8bf12c8304'/>
<id>ee9432a79a9e3599f162a9a8eb1fcc8bf12c8304</id>
<content type='text'>

See merge request !2319</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

See merge request !2319</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'merge-when-build-succeeds-unchecked' into 'master'</title>
<updated>2016-01-06T18:58:10+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-01-06T18:58:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b93744e3008fd2ba313f62f9e5ad8820e0cc8582'/>
<id>b93744e3008fd2ba313f62f9e5ad8820e0cc8582</id>
<content type='text'>

Get "Merge when build succeeds" to work when commits were pushed to MR
target branch while builds were running

The Merge when build succeeds service only merges when the MR is
mergeable (open, not WIP, no conflicts).

When the target branch is updated, all affected MRs have their merge
status set to `unchecked`, and the conflicts check will only happen
when `check_if_can_be_merged` is called, which happens when the MR page
is viewed.

When someone enables the automatic merge, the target branch is updated,
no-one views the MR page again, and the build succeeds, the mergeability
check will fail and the MR will not in fact be merged.

This MR makes sure `check_if_can_be_merged` is always called when MR
mergeability is checked.

See merge request !2304</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Get "Merge when build succeeds" to work when commits were pushed to MR
target branch while builds were running

The Merge when build succeeds service only merges when the MR is
mergeable (open, not WIP, no conflicts).

When the target branch is updated, all affected MRs have their merge
status set to `unchecked`, and the conflicts check will only happen
when `check_if_can_be_merged` is called, which happens when the MR page
is viewed.

When someone enables the automatic merge, the target branch is updated,
no-one views the MR page again, and the build succeeds, the mergeability
check will fail and the MR will not in fact be merged.

This MR makes sure `check_if_can_be_merged` is always called when MR
mergeability is checked.

See merge request !2304</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-issue-1697' into 'master'</title>
<updated>2016-01-06T18:31:28+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-01-06T18:31:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6865d3e5001805c648ba9fefd594540eff47c7b6'/>
<id>6865d3e5001805c648ba9fefd594540eff47c7b6</id>
<content type='text'>

Define a limited set of filters for SingleLinePipeline

Removes the following filters from its parent GfmPipeline:

- SyntaxHighlightFilter
- UploadLinkFilter
- TableOfContentsFilter
- LabelReferenceFilter
- TaskListFilter

Closes #1697 

See merge request !2257</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Define a limited set of filters for SingleLinePipeline

Removes the following filters from its parent GfmPipeline:

- SyntaxHighlightFilter
- UploadLinkFilter
- TableOfContentsFilter
- LabelReferenceFilter
- TaskListFilter

Closes #1697 

See merge request !2257</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-banzai-cache' into 'master'</title>
<updated>2016-01-06T18:11:46+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-01-06T18:11:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=623fa2caf70f9d1eef63fdbee448adedc4c0ede8'/>
<id>623fa2caf70f9d1eef63fdbee448adedc4c0ede8</id>
<content type='text'>

Fix mentionable reference extraction caching.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4130

Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283

See merge request !2315</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix mentionable reference extraction caching.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4130

Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283

See merge request !2315</pre>
</div>
</content>
</entry>
<entry>
<title>Remove InfluxDB username/password</title>
<updated>2016-01-06T16:49:56+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-01-06T16:49:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8fdc00bd4c59183a20a60a6b93228268230bbd2e'/>
<id>8fdc00bd4c59183a20a60a6b93228268230bbd2e</id>
<content type='text'>
InfluxDB over UDP doesn't use authentication, thus there's no need for
these settings.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
InfluxDB over UDP doesn't use authentication, thus there's no need for
these settings.
</pre>
</div>
</content>
</entry>
<entry>
<title>Store SQL/view timings in milliseconds</title>
<updated>2016-01-06T15:37:14+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-01-06T14:30:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7549102bb727daecc51da84af39956b32fc41537'/>
<id>7549102bb727daecc51da84af39956b32fc41537</id>
<content type='text'>
Transaction timings are also already stored in milliseconds, this keeps
things consistent.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Transaction timings are also already stored in milliseconds, this keeps
things consistent.
</pre>
</div>
</content>
</entry>
</feed>
