<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/Gemfile.lock, branch diff-options</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>Revert "Merge branch 'csp-basics' into 'master'"</title>
<updated>2016-07-21T04:19:02+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-07-21T01:04:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9a7815e4e2fabbfa6b4e6209829b9f9684ec617d'/>
<id>9a7815e4e2fabbfa6b4e6209829b9f9684ec617d</id>
<content type='text'>
This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing
changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing
changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
</pre>
</div>
</content>
</entry>
<entry>
<title>use 2.0.5, actually (2.0.4 was a bad release)</title>
<updated>2016-07-19T17:37:55+00:00</updated>
<author>
<name>http://jneen.net/</name>
<email>jneen@jneen.net</email>
</author>
<published>2016-07-19T17:37:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5b124fc328e5981e36a60b7e0f0ab17c0ddd037b'/>
<id>5b124fc328e5981e36a60b7e0f0ab17c0ddd037b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>upgrade rouge to 2.0.4</title>
<updated>2016-07-19T17:28:48+00:00</updated>
<author>
<name>http://jneen.net/</name>
<email>jneen@jneen.net</email>
</author>
<published>2016-07-19T17:28:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=764924b6a96ad1079dfb0e78fa71f8a90efc3752'/>
<id>764924b6a96ad1079dfb0e78fa71f8a90efc3752</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 'cs-gemojione-3' into 'master'</title>
<updated>2016-07-18T23:57:13+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-18T23:57:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a27212ab908d5161f5a75b27c4616c11f497f5d4'/>
<id>a27212ab908d5161f5a75b27c4616c11f497f5d4</id>
<content type='text'>

Upgrade gemojione to 3.0.0

Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12

[Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada:

This update has new emoji and more sensical categories.

See merge request !5237</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Upgrade gemojione to 3.0.0

Upgrades gemojione to 3.0.0, see the Changelog: https://github.com/jonathanwiesel/gemojione/blob/b98aa8b07eef815d4d3f52ff3c8714b28932b0de/CHANGELOG.md#v300-2016-07-12

[Here are all the new 2016 emoji](http://emojione.com/releases/2.2.4/) :tada:

This update has new emoji and more sensical categories.

See merge request !5237</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'csp-basics' into 'master'</title>
<updated>2016-07-18T21:29:04+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-18T21:29:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9065f9c5ff073d376eb6377ca63ead93623fc8a3'/>
<id>9065f9c5ff073d376eb6377ca63ead93623fc8a3</id>
<content type='text'>

Content Security Policy

Ref: #18231 

This uses twitter's [secure_headers gem](https://github.com/twitter/secureheaders).

See merge request !4770</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Content Security Policy

Ref: #18231 

This uses twitter's [secure_headers gem](https://github.com/twitter/secureheaders).

See merge request !4770</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>Initial secure_headers config after some testing.</title>
<updated>2016-07-18T17:43:35+00:00</updated>
<author>
<name>Connor Shea</name>
<email>connor.james.shea@gmail.com</email>
</author>
<published>2016-06-17T21:03:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cc0d15a8869e25eb02b5e829e24ae3933419760f'/>
<id>cc0d15a8869e25eb02b5e829e24ae3933419760f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Upgrade Gemojione from 2.6.1 to 3.0.1.</title>
<updated>2016-07-18T16:40:16+00:00</updated>
<author>
<name>Connor Shea</name>
<email>connor.james.shea@gmail.com</email>
</author>
<published>2016-07-13T14:43:42+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6a06c5cfb92d7d4e390e63104fd42d24a9159048'/>
<id>6a06c5cfb92d7d4e390e63104fd42d24a9159048</id>
<content type='text'>
This adds the 2016 emoji as well as support for using SVG images instead of PNGs.

It also fixes a number of incorrectly categorized emoji and other minor issues.

Upgrade Rake task for Gemojione 3.0.0 and generate sprites.

Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file.

Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16

For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/

Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This adds the 2016 emoji as well as support for using SVG images instead of PNGs.

It also fixes a number of incorrectly categorized emoji and other minor issues.

Upgrade Rake task for Gemojione 3.0.0 and generate sprites.

Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file.

Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16

For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/

Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'feature.rouge-20' into 'master'</title>
<updated>2016-07-15T20:15:30+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-15T20:15:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fbd75c35fd3fd43f6680b925959ac9498e9528a5'/>
<id>fbd75c35fd3fd43f6680b925959ac9498e9528a5</id>
<content type='text'>

Upgrade to Rouge 2.0

## What does this MR do?

This MR is a refactor of the HTMLGitlab formatter. The original was copy-pasted from the legacy HTML formatter and adapted to suit our needs. In particular, this MR:

* Strips dead code and unused options
* Factors out the "wrapping" into the places that care about it - Bonzai and the view helpers
* Uses the Rouge 2.0 `token_lines` method to split tokens into lines, removing the custom code we used to do the same
* Uses the now-public `span` method instead of re-implementing it ourselves
* Removes options to not split into lines - the places where this feature wasn't being used are now using the plain `Formatters::HTML` instead of this class

See merge request !4691</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Upgrade to Rouge 2.0

## What does this MR do?

This MR is a refactor of the HTMLGitlab formatter. The original was copy-pasted from the legacy HTML formatter and adapted to suit our needs. In particular, this MR:

* Strips dead code and unused options
* Factors out the "wrapping" into the places that care about it - Bonzai and the view helpers
* Uses the Rouge 2.0 `token_lines` method to split tokens into lines, removing the custom code we used to do the same
* Uses the now-public `span` method instead of re-implementing it ourselves
* Removes options to not split into lines - the places where this feature wasn't being used are now using the plain `Formatters::HTML` instead of this class

See merge request !4691</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'update-rubocop' into 'master'</title>
<updated>2016-07-15T17:19:38+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-15T17:19:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=dfea11e1e791d0343ccc7d560f03710f5c1e2a98'/>
<id>dfea11e1e791d0343ccc7d560f03710f5c1e2a98</id>
<content type='text'>

Update rubocop to 0.41.2

Adds a couple of cops to the TODO files, but I wanted [a specific cop](https://github.com/bbatsov/rubocop/pull/3135/files) which just had about 65 offences, so Ill do that later.

See merge request !4999</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update rubocop to 0.41.2

Adds a couple of cops to the TODO files, but I wanted [a specific cop](https://github.com/bbatsov/rubocop/pull/3135/files) which just had about 65 offences, so Ill do that later.

See merge request !4999</pre>
</div>
</content>
</entry>
</feed>
