<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/assets/javascripts/merge_conflicts, branch docs-pages-https</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>Adds `eslint-plugin-vue`, fixes linter errors and adds docs</title>
<updated>2018-01-03T23:14:55+00:00</updated>
<author>
<name>Filipa Lacerda</name>
<email>filipa@gitlab.com</email>
</author>
<published>2018-01-03T23:14:55+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b299198e1eb5e1f26d5267f4a64944e600086d6b'/>
<id>b299198e1eb5e1f26d5267f4a64944e600086d6b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Export old code into es6 modules</title>
<updated>2017-12-13T09:26:44+00:00</updated>
<author>
<name>Filipa Lacerda</name>
<email>filipa@gitlab.com</email>
</author>
<published>2017-12-13T09:26:44+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aa90e8ea5b025dc5de5887b2694e25745bf97e48'/>
<id>aa90e8ea5b025dc5de5887b2694e25745bf97e48</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Flash is now a ES6 module</title>
<updated>2017-10-10T09:14:22+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2017-10-02T12:32:53+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fa2af5e0f5e290eff32f62c7ea9f935a6ad33967'/>
<id>fa2af5e0f5e290eff32f62c7ea9f935a6ad33967</id>
<content type='text'>
Reduced the technical debt around our JS flash function by making it a
module that is imported rather than relying on the global function.
The global function still exists mainly for technical debt with how
some requests are being completed, but new JS should import the module
directly.

Also reduces some tech debt in the file by removing the need for jQuery.
Instead Flash is now 100% vanilla JS.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Reduced the technical debt around our JS flash function by making it a
module that is imported rather than relying on the global function.
The global function still exists mainly for technical debt with how
some requests are being completed, but new JS should import the module
directly.

Also reduces some tech debt in the file by removing the need for jQuery.
Instead Flash is now 100% vanilla JS.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into ph-inline-js</title>
<updated>2017-07-27T15:00:30+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2017-07-27T15:00:30+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=76704c7960a880106a7ce5706cb5f3915defb8de'/>
<id>76704c7960a880106a7ce5706cb5f3915defb8de</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fixed label subscription &amp; merge conflicts</title>
<updated>2017-07-26T10:13:35+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2017-07-26T10:13:35+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=425dbdd222244bc00cab8c2dbd6bb94233d11a15'/>
<id>425dbdd222244bc00cab8c2dbd6bb94233d11a15</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fix conflict pluralized</title>
<updated>2017-07-24T15:11:12+00:00</updated>
<author>
<name>Emilien Mottet</name>
<email>emilien.mottet@grenoble-inp.org</email>
</author>
<published>2017-07-24T15:04:54+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a8b33d7b5db99f47000316a8dc167106214ca4f8'/>
<id>a8b33d7b5db99f47000316a8dc167106214ca4f8</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>update remaining uses of CJS syntax to ES module syntax</title>
<updated>2017-05-16T20:52:40+00:00</updated>
<author>
<name>Mike Greiling</name>
<email>mike@pixelcog.com</email>
</author>
<published>2017-05-16T20:52:40+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5bd549187aa68604d320e3d0c1a51ee4ed34c0e3'/>
<id>5bd549187aa68604d320e3d0c1a51ee4ed34c0e3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>remove Cookies class from global space</title>
<updated>2017-03-22T08:07:27+00:00</updated>
<author>
<name>Mike Greiling</name>
<email>mike@pixelcog.com</email>
</author>
<published>2017-03-11T06:45:34+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5f7c0bd7b7cdd6d7f4d735b9efaecea59cecc0c4'/>
<id>5f7c0bd7b7cdd6d7f4d735b9efaecea59cecc0c4</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>remove Vue from the global space</title>
<updated>2017-03-21T03:12:01+00:00</updated>
<author>
<name>Mike Greiling</name>
<email>mike@pixelcog.com</email>
</author>
<published>2017-03-17T17:21:25+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d9dedc36c39abea9464551864094706cdad1bac0'/>
<id>d9dedc36c39abea9464551864094706cdad1bac0</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove .es6 from file extensions (!9241)</title>
<updated>2017-03-05T20:22:40+00:00</updated>
<author>
<name>winniehell</name>
<email>git@winniehell.de</email>
</author>
<published>2017-03-05T19:43:05+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=572f9782d5e8d6307784b61db0dfce48f5118445'/>
<id>572f9782d5e8d6307784b61db0dfce48f5118445</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
