<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/features, branch compare-code-view</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 'revert-lock-for-issuable' into 'master'</title>
<updated>2016-07-15T18:29:50+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-15T18:29:50+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d4677353b84681bd73f321a0b04bb7eba32dbc9c'/>
<id>d4677353b84681bd73f321a0b04bb7eba32dbc9c</id>
<content type='text'>

Revert "Optimistic locking for Issue and Merge Requests"

The migration to add `lock_version` in !5146 to every issue and merge request takes too long on GitLab.com since it has to add a default value of 0 to every row. Unfortunately, Rails 4.2 doesn't work properly if the value is left as `nil`; anything using optimistic locking cannot be edited. 

This bug was fixed in Rails 5.0 via this commit: https://github.com/rails/rails/commit/13772bfa49325a8dc26410d2dcb555665a320f92. I suggest we revert this change for now, and when we upgrade to Rails 5.0 we can reintroduce this feature.

See merge request !5245</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Revert "Optimistic locking for Issue and Merge Requests"

The migration to add `lock_version` in !5146 to every issue and merge request takes too long on GitLab.com since it has to add a default value of 0 to every row. Unfortunately, Rails 4.2 doesn't work properly if the value is left as `nil`; anything using optimistic locking cannot be edited. 

This bug was fixed in Rails 5.0 via this commit: https://github.com/rails/rails/commit/13772bfa49325a8dc26410d2dcb555665a320f92. I suggest we revert this change for now, and when we upgrade to Rails 5.0 we can reintroduce this feature.

See merge request !5245</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'gl-dropdown-issuable-form' into 'master'</title>
<updated>2016-07-15T02:29:10+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-07-15T02:29:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bdb6f1e6fa756ae0db57e0474706685b6115c1e1'/>
<id>bdb6f1e6fa756ae0db57e0474706685b6115c1e1</id>
<content type='text'>

GL dropdowns in issuable form

## What does this MR do?

Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable.

## What are the relevant issue numbers?

Closes #12574 

## Screenshots (if relevant)


See merge request !4970</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

GL dropdowns in issuable form

## What does this MR do?

Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable.

## What are the relevant issue numbers?

Closes #12574 

## Screenshots (if relevant)


See merge request !4970</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Optimistic locking for Issue and Merge Requests"</title>
<updated>2016-07-14T02:17:17+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2016-07-14T02:17:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d7c591915893c8c572e9135db4ec27dc174823fd'/>
<id>d7c591915893c8c572e9135db4ec27dc174823fd</id>
<content type='text'>
This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-knapsack-for-spinach' into 'master'</title>
<updated>2016-07-13T12:30:58+00:00</updated>
<author>
<name>Kamil Trzciński</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-07-13T12:30:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4be505bfd177755103d74ca4874086853a32449a'/>
<id>4be505bfd177755103d74ca4874086853a32449a</id>
<content type='text'>

Fix Knapsack report generation for Spinach

## What does this MR do?
Makes Knapsack auto-balacing work for Spinach tests

## Why was this MR needed?
We used wrong Knapsack adapter, thus making spinach to run split, but not auto-balanced tests for spinach.


See merge request !5230</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix Knapsack report generation for Spinach

## What does this MR do?
Makes Knapsack auto-balacing work for Spinach tests

## Why was this MR needed?
We used wrong Knapsack adapter, thus making spinach to run split, but not auto-balanced tests for spinach.


See merge request !5230</pre>
</div>
</content>
</entry>
<entry>
<title>Fix Knapsack report generation for Spinach</title>
<updated>2016-07-13T09:03:06+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-07-13T09:03:06+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=da47f20a025b27485a0b294ec92571aafe8438e5'/>
<id>da47f20a025b27485a0b294ec92571aafe8438e5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Optimistic locking for Issue and Merge Requests</title>
<updated>2016-07-12T16:52:14+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>valery@gitlab.com</email>
</author>
<published>2016-07-07T21:42:16+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c39356998b1850f3dc26fe0b987cb419c1d1afb4'/>
<id>c39356998b1850f3dc26fe0b987cb419c1d1afb4</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 'quick-start-ci-route' into 'master'</title>
<updated>2016-07-12T00:46:29+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-07-12T00:46:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3999b80e4ebbfad46b093b94ea5ca31c0c3705be'/>
<id>3999b80e4ebbfad46b093b94ea5ca31c0c3705be</id>
<content type='text'>

Make "Get started with Builds" Help Page link work properly

`help_page_path('ci/quick_start', 'README')` causes a link to `https://gitlab.com/help/ci%2Fquick_start/README` which in turn breaks every relative link on the page. This remedies the problem.

That said, this is probably a horrible way of fixing this issue, *but* it does work. I can’t find much information on linking this deeply with Rails routes.

If anyone has suggestions as to a better way of handling this, I'll gladly take them. I tried a few different things, but none of them really worked.

Resolves #14872.

cc: @axil @rspeicher @elstamey

See merge request !3561</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Make "Get started with Builds" Help Page link work properly

`help_page_path('ci/quick_start', 'README')` causes a link to `https://gitlab.com/help/ci%2Fquick_start/README` which in turn breaks every relative link on the page. This remedies the problem.

That said, this is probably a horrible way of fixing this issue, *but* it does work. I can’t find much information on linking this deeply with Rails routes.

If anyone has suggestions as to a better way of handling this, I'll gladly take them. I tried a few different things, but none of them really worked.

Resolves #14872.

cc: @axil @rspeicher @elstamey

See merge request !3561</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into faster-diffs</title>
<updated>2016-07-11T21:19:17+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz1@gmail.com</email>
</author>
<published>2016-07-11T21:19:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0452e0a57e24fdd65f559cc1a8629892714adc7a'/>
<id>0452e0a57e24fdd65f559cc1a8629892714adc7a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update the help_page_path route to accept paths directly instead of using parameters.</title>
<updated>2016-07-11T18:55:25+00:00</updated>
<author>
<name>Connor Shea</name>
<email>connor.james.shea@gmail.com</email>
</author>
<published>2016-05-16T22:06:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3358afa758c7db96ea8fce2a10cdf9c0abe85216'/>
<id>3358afa758c7db96ea8fce2a10cdf9c0abe85216</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 'single-file-diffs' into 'master'</title>
<updated>2016-07-11T17:51:57+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-07-11T17:51:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ef9ba9050e65f9f5572100989745b1b39f764b3b'/>
<id>ef9ba9050e65f9f5572100989745b1b39f764b3b</id>
<content type='text'>

Single file diffs

Closes #14103. Related (not part of this MR): #19553.

This adds a `diff_for_path` action to each place we render diffs (commit, compare, new MR, existing MR) which renders the diff for a single path. The action is always available with the same params as the 'parent' action, to make it simpler to generate the URIs.

If a diff is bigger than 10 KB, it will be collapsed by default and have a data attribute added. You can then click the message or the filename to expand that diff. For expanded files, you can collapse and expand them, but they won't make any AJAX requests.

![Expand_and_collapse_diffs](/uploads/a4072029085082b85c47006f67ac531c/Expand_and_collapse_diffs.gif)

See merge request !4990</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Single file diffs

Closes #14103. Related (not part of this MR): #19553.

This adds a `diff_for_path` action to each place we render diffs (commit, compare, new MR, existing MR) which renders the diff for a single path. The action is always available with the same params as the 'parent' action, to make it simpler to generate the URIs.

If a diff is bigger than 10 KB, it will be collapsed by default and have a data attribute added. You can then click the message or the filename to expand that diff. For expanded files, you can collapse and expand them, but they won't make any AJAX requests.

![Expand_and_collapse_diffs](/uploads/a4072029085082b85c47006f67ac531c/Expand_and_collapse_diffs.gif)

See merge request !4990</pre>
</div>
</content>
</entry>
</feed>
