<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app, branch parallel-tests</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Revert "Revert "Merge branch 'support-go-subpackages' into 'master'""</title>
<updated>2016-03-12T21:05:23+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2016-03-12T21:05:23+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=74d7de81960e6d7037c5ae7d4ecd953ac6ea5deb'/>
<id>74d7de81960e6d7037c5ae7d4ecd953ac6ea5deb</id>
<content type='text'>
This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Merge branch 'support-go-subpackages' into 'master'"</title>
<updated>2016-03-12T17:42:51+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-12T17:42:51+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5a586f364c5d2b866d6a074eff7996f05585b7d5'/>
<id>5a586f364c5d2b866d6a074eff7996f05585b7d5</id>
<content type='text'>
This reverts merge request !3191</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts merge request !3191</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'support-go-subpackages' into 'master'</title>
<updated>2016-03-12T17:38:08+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-12T17:38:08+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=826bc72c12cde117c52bfc4b2acb59254a24eff9'/>
<id>826bc72c12cde117c52bfc4b2acb59254a24eff9</id>
<content type='text'>

Support Golang subpackage fetching

Closes #13805

See merge request !3191</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Support Golang subpackage fetching

Closes #13805

See merge request !3191</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'projects-finder-ee-compatible' into 'master'</title>
<updated>2016-03-12T16:50:51+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-03-12T16:50:51+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a3b626bf2544a1ad98651a2a2c5cdd13dc934e12'/>
<id>a3b626bf2544a1ad98651a2a2c5cdd13dc934e12</id>
<content type='text'>

Removed User#project_relations

This is to make things more compatible with EE so merging is easier.

cc @dzaporozhets 

See merge request !3192</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Removed User#project_relations

This is to make things more compatible with EE so merging is easier.

cc @dzaporozhets 

See merge request !3192</pre>
</div>
</content>
</entry>
<entry>
<title>Remove existing go_import.html.haml implementation</title>
<updated>2016-03-12T15:49:16+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2016-03-12T15:49:16+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2563213ccf3c1b26d58292570f9170f73034b221'/>
<id>2563213ccf3c1b26d58292570f9170f73034b221</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Removed User#project_relations</title>
<updated>2016-03-12T14:44:48+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-03-12T14:44:48+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3b76b73ab178f0504e2a9be934fb13f239c81857'/>
<id>3b76b73ab178f0504e2a9be934fb13f239c81857</id>
<content type='text'>
GitLab EE adds an extra relation that selects a "project_id" column
instead of an "id" column, making it very hard for this method to be
re-used in EE. Since using User#authorized_groups in
ProjectsFinder#all_groups apparently has no performance impact we can
just use it and keep everything compatible with EE.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
GitLab EE adds an extra relation that selects a "project_id" column
instead of an "id" column, making it very hard for this method to be
re-used in EE. Since using User#authorized_groups in
ProjectsFinder#all_groups apparently has no performance impact we can
just use it and keep everything compatible with EE.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-disallow-blank-line-code' into 'master'</title>
<updated>2016-03-12T14:01:06+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-12T14:01:06+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8ee1c0ffe538f1b0a4eecf859c3e79724ffae5ef'/>
<id>8ee1c0ffe538f1b0a4eecf859c3e79724ffae5ef</id>
<content type='text'>

Disallow blank (non-null) values for a Note's `line_code` attribute

It's unclear how these blank values got added, but GitLab.com had a few:

```
irb(main):002:0&gt; Note.where("line_code IS NOT NULL AND line_code = ''").count
=&gt; 439
```

We've added a migration to convert any existing records to use a NULL
value when blank, and updated Note to set blank values to nil before
validation.

See merge request !3118</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Disallow blank (non-null) values for a Note's `line_code` attribute

It's unclear how these blank values got added, but GitLab.com had a few:

```
irb(main):002:0&gt; Note.where("line_code IS NOT NULL AND line_code = ''").count
=&gt; 439
```

We've added a migration to convert any existing records to use a NULL
value when blank, and updated Note to set blank values to nil before
validation.

See merge request !3118</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/token-timing-attack' into 'master'</title>
<updated>2016-03-12T12:14:32+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-12T12:14:32+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=34e8c562363a130ca9f2a6be7959efbc54e64663'/>
<id>34e8c562363a130ca9f2a6be7959efbc54e64663</id>
<content type='text'>

fix token issue - timing attack

Updates token comparisons to use a secure version instead of `==`

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13617

See merge request !3062</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

fix token issue - timing attack

Updates token comparisons to use a secure version instead of `==`

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13617

See merge request !3062</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup'</title>
<updated>2016-03-12T12:12:40+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-03-12T12:12:40+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2b9b07891c402f6407a8b099fe67c78a43266ea1'/>
<id>2b9b07891c402f6407a8b099fe67c78a43266ea1</id>
<content type='text'>
# Conflicts:
#	app/helpers/application_helper.rb
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	app/helpers/application_helper.rb
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix_responsive_layout_bug' into 'master'</title>
<updated>2016-03-11T22:58:14+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz1@gmail.com</email>
</author>
<published>2016-03-11T22:58:14+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=491d0ae1c306f60919f8048844a130d89e41f565'/>
<id>491d0ae1c306f60919f8048844a130d89e41f565</id>
<content type='text'>

Fix responsive bug top navigation

Hi,

I have found and fixed a minor layout bug (responsive)

This is the situation before the fix:
![before](/uploads/55bf61a64fb49a763c5f8381bf46d390/before.png)

And this is the situation after the fix:
![after](/uploads/33ba091156d404e52c41f134121c59f0/after.png)

See merge request !3190</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix responsive bug top navigation

Hi,

I have found and fixed a minor layout bug (responsive)

This is the situation before the fix:
![before](/uploads/55bf61a64fb49a763c5f8381bf46d390/before.png)

And this is the situation after the fix:
![after](/uploads/33ba091156d404e52c41f134121c59f0/after.png)

See merge request !3190</pre>
</div>
</content>
</entry>
</feed>
