<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/controllers, branch api-dev-can-push</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 'caironoleto/gitlab-ce-cn-issue-19747'</title>
<updated>2016-07-18T21:44:58+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-07-18T21:44:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aba558a4a8c7e9e3c691c0e689a0926d4604a26a'/>
<id>aba558a4a8c7e9e3c691c0e689a0926d4604a26a</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 'issue_13343' into 'master'</title>
<updated>2016-07-18T21:38:22+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-18T21:38:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4b6e6d0ad222e0fbacf300975be961fcbc7bdccd'/>
<id>4b6e6d0ad222e0fbacf300975be961fcbc7bdccd</id>
<content type='text'>

Allow build email service to be tested

Fixes #13343 

See merge request !5223</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Allow build email service to be tested

Fixes #13343 

See merge request !5223</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '19820-safer-diffs' into 'master'</title>
<updated>2016-07-18T21:28:24+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-07-18T21:28:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f0b446e55506b251e85afd4bb063586bccb52eb2'/>
<id>f0b446e55506b251e85afd4bb063586bccb52eb2</id>
<content type='text'>

Collapsed diffs lines/size don't accumulate to overflow diffs.

## What does this MR do?

Reduce the number of lines that we highlight on big diffs to try to reduce the degradation introduced by  !4990 as you can see on the issue description #19820 .

We collapse any files after the diff is over the number of safe files (100), or over the safe lines (500) or over the safe number of bytes (5KB x 100 files).

We still need to bump the gitlab_git and point this branch to the new gitlab_git version.

## What are the relevant issue numbers?

Closes #19820 
Closes #19885

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)


See merge request !5306</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Collapsed diffs lines/size don't accumulate to overflow diffs.

## What does this MR do?

Reduce the number of lines that we highlight on big diffs to try to reduce the degradation introduced by  !4990 as you can see on the issue description #19820 .

We collapse any files after the diff is over the number of safe files (100), or over the safe lines (500) or over the safe number of bytes (5KB x 100 files).

We still need to bump the gitlab_git and point this branch to the new gitlab_git version.

## What are the relevant issue numbers?

Closes #19820 
Closes #19885

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)


See merge request !5306</pre>
</div>
</content>
</entry>
<entry>
<title>Collapsed diffs lines/size don't accumulate to overflow diffs.</title>
<updated>2016-07-18T20:43:28+00:00</updated>
<author>
<name>Paco Guzman</name>
<email>pacoguzmanp@gmail.com</email>
</author>
<published>2016-07-15T07:04:18+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a404ab380db5959ab22b09bc586607b1f6c507cd'/>
<id>a404ab380db5959ab22b09bc586607b1f6c507cd</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 'undo-revert-of-4892' into 'master'</title>
<updated>2016-07-18T15:31:07+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-07-18T15:31:07+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=08264f4334ff48d1274f066cd5b03455bc4befdf'/>
<id>08264f4334ff48d1274f066cd5b03455bc4befdf</id>
<content type='text'>

Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'""

## What does this MR do?

Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564.

## What are the relevant issue numbers?

Closes #19872.

See merge request !5310</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'""

## What does this MR do?

Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564.

## What are the relevant issue numbers?

Closes #19872.

See merge request !5310</pre>
</div>
</content>
</entry>
<entry>
<title>Don't blow up in tree view on empty repo</title>
<updated>2016-07-18T13:06:21+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-07-18T10:58:50+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=87035c294502451708262d68e228f7cb9e244552'/>
<id>87035c294502451708262d68e228f7cb9e244552</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add Pending Tab to Admin Builds</title>
<updated>2016-07-18T08:23:32+00:00</updated>
<author>
<name>Katarzyna Kobierska</name>
<email>kkobierska@gmail.com</email>
</author>
<published>2016-07-05T08:10:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5813aec22dac9a896e75a23781934d555aef4269'/>
<id>5813aec22dac9a896e75a23781934d555aef4269</id>
<content type='text'>
Add Pending Tab to Project Builds

Update CHANGELOG
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add Pending Tab to Project Builds

Update CHANGELOG
</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'""</title>
<updated>2016-07-18T08:16:56+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-07-18T08:16:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2cf7f09b1e9ccb000433374a42bd7b33b73f8116'/>
<id>2cf7f09b1e9ccb000433374a42bd7b33b73f8116</id>
<content type='text'>
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50.

See !4892.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50.

See !4892.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Allow build email service to be tested</title>
<updated>2016-07-15T23:38:27+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2016-07-12T21:19:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2e9d53586874a83cea7e7d29a49bde1180e15829'/>
<id>2e9d53586874a83cea7e7d29a49bde1180e15829</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 '17341-firefox-u2f' into 'master'</title>
<updated>2016-07-15T20:07:51+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-15T20:07:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=27e4a95221539ccb6749b2de8a75a8c17427115f'/>
<id>27e4a95221539ccb6749b2de8a75a8c17427115f</id>
<content type='text'>

Allow U2F devices to be used in Firefox

- Adds U2F support for Firefox
- Improve U2F feature detection logic
- Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`)

- Closes #17341 
- Related to #15337 

See merge request !5177</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Allow U2F devices to be used in Firefox

- Adds U2F support for Firefox
- Improve U2F feature detection logic
- Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`)

- Closes #17341 
- Related to #15337 

See merge request !5177</pre>
</div>
</content>
</entry>
</feed>
