<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch rename-inline-diff</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>Fewer html_safes</title>
<updated>2016-01-30T11:54:19+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-01-30T11:54:19+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=47afe7ae8ff33c756c9ff6e2339a82f07bf11c07'/>
<id>47afe7ae8ff33c756c9ff6e2339a82f07bf11c07</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix specs and add a new one</title>
<updated>2016-01-30T11:53:12+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-01-30T11:53:12+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fa0cbb13990a7e7edec55e9724e9c4d676743f3b'/>
<id>fa0cbb13990a7e7edec55e9724e9c4d676743f3b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Mark inline difference between old and new paths when a file is renamed</title>
<updated>2016-01-29T18:37:17+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-01-29T18:37:17+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=677b4db9e682b29bb15dddb84fe80b976490a671'/>
<id>677b4db9e682b29bb15dddb84fe80b976490a671</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 'rs-remove-ip-blocking' into 'master'</title>
<updated>2016-01-29T13:31:33+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-01-29T13:31:33+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e221990ebac72b8b229b8c3ff38069edbf7776a7'/>
<id>e221990ebac72b8b229b8c3ff38069edbf7776a7</id>
<content type='text'>

Partially revert "Add IP check against DNSBLs at account sign-up"

This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.

See merge request !2643</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Partially revert "Add IP check against DNSBLs at account sign-up"

This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.

See merge request !2643</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-transient-capybara-timeout' into 'master'</title>
<updated>2016-01-29T09:53:04+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-01-29T09:53:04+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f5860ce6466bf8934bc01254351bffd005dfeafe'/>
<id>f5860ce6466bf8934bc01254351bffd005dfeafe</id>
<content type='text'>

Prevent transient Capybara timeouts during feature tests

The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.

Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.

See merge request !2646</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Prevent transient Capybara timeouts during feature tests

The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.

Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.

See merge request !2646</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master'</title>
<updated>2016-01-29T09:40:18+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-01-29T09:40:18+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=74e1add2fcbd47ec748e04c65d3eb947dba73cf2'/>
<id>74e1add2fcbd47ec748e04c65d3eb947dba73cf2</id>
<content type='text'>

Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""

This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33.

See merge request !2642</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""

This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33.

See merge request !2642</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'hotfix/ruby-21-broken-update' into 'master'</title>
<updated>2016-01-29T08:12:18+00:00</updated>
<author>
<name>Marin Jankovski</name>
<email>marin@gitlab.com</email>
</author>
<published>2016-01-29T08:12:18+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9d0065f05455e1f9146ab30a3aaf903472c9b8f4'/>
<id>9d0065f05455e1f9146ab30a3aaf903472c9b8f4</id>
<content type='text'>

fix syntax error on 2.1 and rubocop on 2.2

Background:

Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 

We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.

Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 

Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801

See merge request !2637</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

fix syntax error on 2.1 and rubocop on 2.2

Background:

Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 

We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.

Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 

Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801

See merge request !2637</pre>
</div>
</content>
</entry>
<entry>
<title>Prevent transient Capybara timeouts during feature tests</title>
<updated>2016-01-29T01:56:49+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-01-29T01:45:03+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bbe0fa91d01fb9bc70d54e07ee393e857d92a267'/>
<id>bbe0fa91d01fb9bc70d54e07ee393e857d92a267</id>
<content type='text'>
The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.

Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.

Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.
</pre>
</div>
</content>
</entry>
<entry>
<title>Make changes in config/initializers/1_settings.rb</title>
<updated>2016-01-29T01:06:21+00:00</updated>
<author>
<name>Sytse Sijbrandij</name>
<email>sytse@gitlab.com</email>
</author>
<published>2016-01-29T01:06:21+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=92c04ecbd7308b7ccb53bb4a8adac8706285f481'/>
<id>92c04ecbd7308b7ccb53bb4a8adac8706285f481</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Partially revert "Add IP check against DNSBLs at account sign-up"</title>
<updated>2016-01-28T21:28:19+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-01-28T21:28:19+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ca05054ea2a8aff81822f310c5dafb68ae26e10e'/>
<id>ca05054ea2a8aff81822f310c5dafb68ae26e10e</id>
<content type='text'>
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
</pre>
</div>
</content>
</entry>
</feed>
