<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec, 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 'disable-statement-timeout' into 'master'</title>
<updated>2016-07-15T14:51:20+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-15T14:51:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8b7932c21951de172d531ab8a3e9506c98db7483'/>
<id>8b7932c21951de172d531ab8a3e9506c98db7483</id>
<content type='text'>

Disable PostgreSQL statement timeout during migrations

Long-running migrations may take more than the timeout allowed by the database. Disable the session's statement timeout to ensure migrations don't get killed prematurely.

See merge request !5263</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Disable PostgreSQL statement timeout during migrations

Long-running migrations may take more than the timeout allowed by the database. Disable the session's statement timeout to ensure migrations don't get killed prematurely.

See merge request !5263</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/import-issues-last-updated' into 'master'</title>
<updated>2016-07-15T14:44:04+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-15T14:44:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7cb51ba5728626433a2620940f969419e1daa895'/>
<id>7cb51ba5728626433a2620940f969419e1daa895</id>
<content type='text'>

Fix issues last update timestamp not preserved after importing a project

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19689 and https://gitlab.com/gitlab-org/gitlab-ce/issues/19792 (similar, but not the same)

Now `updated_at` should be the time from the original project.

See merge request !5253</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix issues last update timestamp not preserved after importing a project

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19689 and https://gitlab.com/gitlab-org/gitlab-ce/issues/19792 (similar, but not the same)

Now `updated_at` should be the time from the original project.

See merge request !5253</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'update-branch-names-in-gc' into 'master'</title>
<updated>2016-07-15T08:36:30+00:00</updated>
<author>
<name>Jacob Vosmaer (GitLab)</name>
<email>jacob@gitlab.com</email>
</author>
<published>2016-07-15T08:36:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=86f83db2b0ebc6d4cf546a71e151bb8552215a3a'/>
<id>86f83db2b0ebc6d4cf546a71e151bb8552215a3a</id>
<content type='text'>

Refresh branch cache after `git gc`

As discussed in !5160, we should refresh the branch name list after expiring to make sure we are in a good state and that we do not affect view performance (as much).


See merge request !5235</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Refresh branch cache after `git gc`

As discussed in !5160, we should refresh the branch name list after expiring to make sure we are in a good state and that we do not affect view performance (as much).


See merge request !5235</pre>
</div>
</content>
</entry>
<entry>
<title>Fix spec Don't attempt to disable statement timeout on a MySQL DB</title>
<updated>2016-07-15T03:55:33+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2016-07-15T03:55:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3fd304c1a5063ad9fd53b851de79322f49c68997'/>
<id>3fd304c1a5063ad9fd53b851de79322f49c68997</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 '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>Merge branch 'compare-dropdowns' into 'master'</title>
<updated>2016-07-15T02:27:21+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-07-15T02:27:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7cdcb295c71ffec4b8b9c4c9e88d8fd922ec9772'/>
<id>7cdcb295c71ffec4b8b9c4c9e88d8fd922ec9772</id>
<content type='text'>

Updated compare dropdowns

## What does this MR do?

Removes jQuery autocomplete from compare fields and replaces with GitLabs dropdowns.

## What are the relevant issue numbers?

Closes #18891 

## Screenshots (if relevant)

![Screen_Shot_2016-06-24_at_14.24.34](/uploads/f34370390183429f604fc48645390f2f/Screen_Shot_2016-06-24_at_14.24.34.png)

See merge request !4895</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Updated compare dropdowns

## What does this MR do?

Removes jQuery autocomplete from compare fields and replaces with GitLabs dropdowns.

## What are the relevant issue numbers?

Closes #18891 

## Screenshots (if relevant)

![Screen_Shot_2016-06-24_at_14.24.34](/uploads/f34370390183429f604fc48645390f2f/Screen_Shot_2016-06-24_at_14.24.34.png)

See merge request !4895</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/persistent-import-data' into 'master'</title>
<updated>2016-07-14T14:50:34+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-14T14:50:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c49517a0048f24e57f6d6ab2a5e80c8de132280d'/>
<id>c49517a0048f24e57f6d6ab2a5e80c8de132280d</id>
<content type='text'>

Fix import_data being saved as a result of an invalid import_url

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19479

Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. &lt;= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276

Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276

See merge request !5206</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix import_data being saved as a result of an invalid import_url

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19479

Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. &lt;= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276

Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276

See merge request !5206</pre>
</div>
</content>
</entry>
<entry>
<title>fix updated_at not preserved after import - for GitLab projects</title>
<updated>2016-07-14T14:03:00+00:00</updated>
<author>
<name>James Lopez</name>
<email>james@jameslopez.es</email>
</author>
<published>2016-07-14T14:03:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b1ab079fae3fbebd0277e16682872632463cd0e2'/>
<id>b1ab079fae3fbebd0277e16682872632463cd0e2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</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>
</feed>
