<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/controllers/projects, branch sh-document-plus-encoding-api</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 'master' into sh-security-fix-backports-master</title>
<updated>2017-10-17T23:02:32+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2017-10-17T23:02:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=891a9ce8b0839fb478ca5704022b2e921097fe27'/>
<id>891a9ce8b0839fb478ca5704022b2e921097fe27</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 'security-10-1' into '10-1-stable'</title>
<updated>2017-10-17T22:58:58+00:00</updated>
<author>
<name>Jen-Shin Lin</name>
<email>jen-shin@gitlab.com</email>
</author>
<published>2017-10-17T10:12:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bd46c8abfd5ee964c47eff0ace021e45cbbe6687'/>
<id>bd46c8abfd5ee964c47eff0ace021e45cbbe6687</id>
<content type='text'>
Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ph-multi-file-editor-restructure-data' into 'master'</title>
<updated>2017-10-17T17:40:13+00:00</updated>
<author>
<name>Filipa Lacerda</name>
<email>filipa@gitlab.com</email>
</author>
<published>2017-10-17T17:40:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b3f749036ea919de3982c81b157ab2d790ecb4c5'/>
<id>b3f749036ea919de3982c81b157ab2d790ecb4c5</id>
<content type='text'>
Refactored multi-file data structure

See merge request gitlab-org/gitlab-ce!14862</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Refactored multi-file data structure

See merge request gitlab-org/gitlab-ce!14862</pre>
</div>
</content>
</entry>
<entry>
<title>Fixed bug when clicking file link causing user to navigate away</title>
<updated>2017-10-17T10:03:12+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2017-10-17T10:03:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c3dec96e837d6118b2a3d354ec1f142894da48a1'/>
<id>c3dec96e837d6118b2a3d354ec1f142894da48a1</id>
<content type='text'>
Adds a test for flattenedFiles
Changes the data method to not be an arrow method
Various other review fixes
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Adds a test for flattenedFiles
Changes the data method to not be an arrow method
Various other review fixes
</pre>
</div>
</content>
</entry>
<entry>
<title>Refactored multi-file data structure</title>
<updated>2017-10-16T10:29:30+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2017-10-13T09:08:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b1b91aa0658d81107327884ca56f579cf6146078'/>
<id>b1b91aa0658d81107327884ca56f579cf6146078</id>
<content type='text'>
This moves away from storing in a single array just to render the table.
It now stores in a multi-dimensional array/object type where each entry
in the array can have its own tree. This makes storing the data for
future feature a little easier as there is only one way to store the
data.

Previously to insert a directory the code had to insert the directory
&amp; then the file at the right point in the array. Now the directory
can be inserted anywhere &amp; then a file can be quickly added into this
directory.

The rendering is still done with a single array, but this is handled
through underscore. Underscore takes the array &amp; then goes through
each item to flatten it into one. It is done this way to save changing
the markup away from table, keeping it as a table keeps it semantically
correct.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This moves away from storing in a single array just to render the table.
It now stores in a multi-dimensional array/object type where each entry
in the array can have its own tree. This makes storing the data for
future feature a little easier as there is only one way to store the
data.

Previously to insert a directory the code had to insert the directory
&amp; then the file at the right point in the array. Now the directory
can be inserted anywhere &amp; then a file can be quickly added into this
directory.

The rendering is still done with a single array, but this is handled
through underscore. Underscore takes the array &amp; then goes through
each item to flatten it into one. It is done this way to save changing
the markup away from table, keeping it as a table keeps it semantically
correct.
</pre>
</div>
</content>
</entry>
<entry>
<title>Create a Gitlab::Git submodule for conlict-related files</title>
<updated>2017-10-13T01:03:15+00:00</updated>
<author>
<name>Alejandro Rodríguez</name>
<email>alejorro70@gmail.com</email>
</author>
<published>2017-10-09T19:40:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821'/>
<id>faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821</id>
<content type='text'>
Rename classes to (hopefully) clearer names while we're doing that.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Rename classes to (hopefully) clearer names while we're doing that.
</pre>
</div>
</content>
</entry>
<entry>
<title>Refactor conflict resolution to contain git ops within Gitlab::Git</title>
<updated>2017-10-13T01:03:14+00:00</updated>
<author>
<name>Alejandro Rodríguez</name>
<email>alejorro70@gmail.com</email>
</author>
<published>2017-10-07T01:41:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3fcab51ebb0f3156b5d732d050b292cd3e081262'/>
<id>3fcab51ebb0f3156b5d732d050b292cd3e081262</id>
<content type='text'>
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
</pre>
</div>
</content>
</entry>
<entry>
<title>Add support for markdown preview to group milestones</title>
<updated>2017-10-11T09:03:19+00:00</updated>
<author>
<name>Vitaliy @blackst0ne Klachkov</name>
<email>blackst0ne.ru@gmail.com</email>
</author>
<published>2017-10-11T09:03:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=64bb19069dba585c6e4622073e5140f052c2661a'/>
<id>64bb19069dba585c6e4622073e5140f052c2661a</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 'tc-geo-read-only-idea' into 'master'</title>
<updated>2017-10-07T11:01:21+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-10-07T11:01:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=546b18b90317c0c9c0163ddcc5c54798a0bed841'/>
<id>546b18b90317c0c9c0163ddcc5c54798a0bed841</id>
<content type='text'>
Create idea of read-only database

Closes #37534

See merge request gitlab-org/gitlab-ce!14688</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Create idea of read-only database

Closes #37534

See merge request gitlab-org/gitlab-ce!14688</pre>
</div>
</content>
</entry>
<entry>
<title>Find branches in all projects in the fork network</title>
<updated>2017-10-07T09:46:23+00:00</updated>
<author>
<name>Bob Van Landuyt</name>
<email>bob@vanlanduyt.co</email>
</author>
<published>2017-09-21T16:34:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7c00b53812895970fdb00cf1d27b059bb15815cd'/>
<id>7c00b53812895970fdb00cf1d27b059bb15815cd</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
