<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch fix/github-importer-client</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>Fix broken handling of certain calls in GitHub importer client</title>
<updated>2016-10-06T09:14:25+00:00</updated>
<author>
<name>Ahmad Sherif</name>
<email>me@ahmadsherif.com</email>
</author>
<published>2016-10-05T19:20:00+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=333c02a8c822dfab1b98c55db8fb8daa4c53bd51'/>
<id>333c02a8c822dfab1b98c55db8fb8daa4c53bd51</id>
<content type='text'>
Closes #22998
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #22998
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'dz-split-routes' into 'master'</title>
<updated>2016-10-05T14:39:28+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-10-05T14:39:28+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ba4c392721bc5d784b5d71a5ea41ee83edebc923'/>
<id>ba4c392721bc5d784b5d71a5ea41ee83edebc923</id>
<content type='text'>

Split routes on multiple files

Because current 1k routing file is just impossible to read and manage. 

See merge request !6692</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Split routes on multiple files

Because current 1k routing file is just impossible to read and manage. 

See merge request !6692</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'desplacturing' into 'master'</title>
<updated>2016-10-05T14:22:43+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-10-05T14:22:43+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=423943da57930db8bf85134e3008ebb2c421bf32'/>
<id>423943da57930db8bf85134e3008ebb2c421bf32</id>
<content type='text'>

Refactor remnants of CoffeeScript destructured opts and super into ES6

## What does this MR do?

Gets rid of some CoffeeScript remnants that are difficult to work with, and updates them to use ES6 syntax/constructs. I updated nearby code to ES6, but these updates usually just included using the es6 class syntax and scoped variable keywords. 

**Important**: For the most part, I tried to avoid refactoring the design of the existing code. If I attempted that, this would've taken much much longer and it would've been out of this issue's scope. 

## Why was this MR needed?

The compiled coffeescript for destructured default params is very difficult to work in. 

These changes makes some of these rough patches more maintainable:

e.g.
![Screen_Shot_2016-09-19_at_4.43.08_PM](/uploads/40cd3f79b9c5f595f3738213b0dadbbf/Screen_Shot_2016-09-19_at_4.43.08_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Meta Issue: 
https://gitlab.com/gitlab-org/gitlab-ce/issues/21887

Child Issues: 

https://gitlab.com/gitlab-org/gitlab-ce/issues/21942

https://gitlab.com/gitlab-org/gitlab-ce/issues/21941

https://gitlab.com/gitlab-org/gitlab-ce/issues/21943

## To Test Manually: 

#### app/assets/javascripts/LabelManager.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-1)
- Navigate to [Labels](http://localhost:3000/gitlab-org/gitlab-test/labels) and click around (toggle label priority, add new labels, subcribe, edit, delete)

#### app/assets/javascripts/blob/blob_ci_yaml.js.es6  -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-3)
- [Create new file](http://localhost:3000/gitlab-org/gitlab-test/new/master) and give it the name `.gitlab-ci.yml`, then attempt to select a template

#### app/assets/javascripts/blob/blob_license_selectors.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-7)
- [Create new file](http://localhost:3000/gitlab-org/gitlab-test/new/master) and give it the name `license`, then attempt to select a template

#### app/assets/javascripts/blob/template_selector.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-8)
- This class is extended by the two previously mentioned files. As long as they work, this should work.

#### app/assets/javascripts/issues-bulk-assignment.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-11)
- [Visit issues](http://localhost:3000/gitlab-org/gitlab-test/issues), assign multiple issues a new label or milestone and update.

#### app/assets/javascripts/profile/gl_crop.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-12)
- [Visit your profile settings](http://localhost:3000/profile), upload a photo and attempt to crop and set as new profile picture.

#### app/assets/javascripts/profile/profile.js.es6 &gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-14)
- [Visit your profile settings](http://localhost:3000/profile), change various fields (Name, Bio, Email, Notifs settings) and submit form

#### app/assets/javascripts/todos.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-18)
- [Visit an issue](http://localhost:3000/documentcloud/underscore/issues/6) and Add Todo, then visit [Todos](http://localhost:3000/dashboard/todos). Try out the sorting features, making sure everything looks right. Mark the Todo done. 

#### app/assets/javascripts/user.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-19)
- [Visit user profile](http://localhost:3000/u/root) and click between tabs. 

#### app/assets/javascripts/user_tabs.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-20)
- Same as previous.

cc: @jschatz1

See merge request !6261</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Refactor remnants of CoffeeScript destructured opts and super into ES6

## What does this MR do?

Gets rid of some CoffeeScript remnants that are difficult to work with, and updates them to use ES6 syntax/constructs. I updated nearby code to ES6, but these updates usually just included using the es6 class syntax and scoped variable keywords. 

**Important**: For the most part, I tried to avoid refactoring the design of the existing code. If I attempted that, this would've taken much much longer and it would've been out of this issue's scope. 

## Why was this MR needed?

The compiled coffeescript for destructured default params is very difficult to work in. 

These changes makes some of these rough patches more maintainable:

e.g.
![Screen_Shot_2016-09-19_at_4.43.08_PM](/uploads/40cd3f79b9c5f595f3738213b0dadbbf/Screen_Shot_2016-09-19_at_4.43.08_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Meta Issue: 
https://gitlab.com/gitlab-org/gitlab-ce/issues/21887

Child Issues: 

https://gitlab.com/gitlab-org/gitlab-ce/issues/21942

https://gitlab.com/gitlab-org/gitlab-ce/issues/21941

https://gitlab.com/gitlab-org/gitlab-ce/issues/21943

## To Test Manually: 

#### app/assets/javascripts/LabelManager.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-1)
- Navigate to [Labels](http://localhost:3000/gitlab-org/gitlab-test/labels) and click around (toggle label priority, add new labels, subcribe, edit, delete)

#### app/assets/javascripts/blob/blob_ci_yaml.js.es6  -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-3)
- [Create new file](http://localhost:3000/gitlab-org/gitlab-test/new/master) and give it the name `.gitlab-ci.yml`, then attempt to select a template

#### app/assets/javascripts/blob/blob_license_selectors.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-7)
- [Create new file](http://localhost:3000/gitlab-org/gitlab-test/new/master) and give it the name `license`, then attempt to select a template

#### app/assets/javascripts/blob/template_selector.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-8)
- This class is extended by the two previously mentioned files. As long as they work, this should work.

#### app/assets/javascripts/issues-bulk-assignment.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-11)
- [Visit issues](http://localhost:3000/gitlab-org/gitlab-test/issues), assign multiple issues a new label or milestone and update.

#### app/assets/javascripts/profile/gl_crop.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-12)
- [Visit your profile settings](http://localhost:3000/profile), upload a photo and attempt to crop and set as new profile picture.

#### app/assets/javascripts/profile/profile.js.es6 &gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-14)
- [Visit your profile settings](http://localhost:3000/profile), change various fields (Name, Bio, Email, Notifs settings) and submit form

#### app/assets/javascripts/todos.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-18)
- [Visit an issue](http://localhost:3000/documentcloud/underscore/issues/6) and Add Todo, then visit [Todos](http://localhost:3000/dashboard/todos). Try out the sorting features, making sure everything looks right. Mark the Todo done. 

#### app/assets/javascripts/user.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-19)
- [Visit user profile](http://localhost:3000/u/root) and click between tabs. 

#### app/assets/javascripts/user_tabs.js.es6 -&gt; [diff](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6261/diffs#diff-20)
- Same as previous.

cc: @jschatz1

See merge request !6261</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '22509-pipeline-tables' into 'master'</title>
<updated>2016-10-05T13:57:40+00:00</updated>
<author>
<name>Annabel Dunstone Gray</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-10-05T13:57:40+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=219413c5d1dbc05c4832ca372d4b06c06f2e0542'/>
<id>219413c5d1dbc05c4832ca372d4b06c06f2e0542</id>
<content type='text'>

Fixes Pipeline list commit column width should be adjusted

## What does this MR do?
- Fixes some HTML problems
  - Pipeline and Build tables were inside an `ul` tag
  - Pipeline table had 2 `tbody` tags and no `thead`
- Adds grid classes in Pipeline table in order to be responsive: The content of the last column was being hidden but the column it self was not which results in a lot of blank space
- Adds a percentage width to the commit column in the Pipeline table.
- Removes one level of nesting in the commit column in the Pipeline table and to the Build column in the Build table.

## Are there points in the code the reviewer needs to double check?
No

## Why was this MR needed?
The commit column had to much white space.

## Screenshots (if relevant)
![pipelines](/uploads/d198f07dceb498cc7ec537842cd34fff/pipelines.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
Closes #22509

See merge request !6595</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fixes Pipeline list commit column width should be adjusted

## What does this MR do?
- Fixes some HTML problems
  - Pipeline and Build tables were inside an `ul` tag
  - Pipeline table had 2 `tbody` tags and no `thead`
- Adds grid classes in Pipeline table in order to be responsive: The content of the last column was being hidden but the column it self was not which results in a lot of blank space
- Adds a percentage width to the commit column in the Pipeline table.
- Removes one level of nesting in the commit column in the Pipeline table and to the Build column in the Build table.

## Are there points in the code the reviewer needs to double check?
No

## Why was this MR needed?
The commit column had to much white space.

## Screenshots (if relevant)
![pipelines](/uploads/d198f07dceb498cc7ec537842cd34fff/pipelines.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
Closes #22509

See merge request !6595</pre>
</div>
</content>
</entry>
<entry>
<title>Put namespaces#show route below user ssh keys route</title>
<updated>2016-10-05T13:40:11+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-10-05T13:40:11+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a7352c35fcefeba7246801c6e179e389945d3c2a'/>
<id>a7352c35fcefeba7246801c6e179e389945d3c2a</id>
<content type='text'>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Put user keys routing back below project routing</title>
<updated>2016-10-05T13:05:26+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-10-05T13:05:26+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b3151828e74346f54b20711593829191b1a7a829'/>
<id>b3151828e74346f54b20711593829191b1a7a829</id>
<content type='text'>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Split routes on multiple files</title>
<updated>2016-10-05T12:21:27+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-10-05T12:21:27+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f223a41660f1a629614d3d559468b1a5488b96d8'/>
<id>f223a41660f1a629614d3d559468b1a5488b96d8</id>
<content type='text'>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'test-improve-gitlab-identifier' into 'master'</title>
<updated>2016-10-05T11:38:58+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-10-05T11:38:58+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c9396bc7c5b7b55fd01ec63279f5ab4223c0a184'/>
<id>c9396bc7c5b7b55fd01ec63279f5ab4223c0a184</id>
<content type='text'>

Refactor Gitlab::Identifier

## What does this MR do?

This refactors `Gitlab::Identifier` so that it:

1. Has tests
2. Caches output in an instance variable to reduce queries
3. Uses only a single query to find a user by an SSH key, instead of 2

## Why was this MR needed?

This code was untested and would execute more SQL queries than needed.

See merge request !6680</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Refactor Gitlab::Identifier

## What does this MR do?

This refactors `Gitlab::Identifier` so that it:

1. Has tests
2. Caches output in an instance variable to reduce queries
3. Uses only a single query to find a user by an SSH key, instead of 2

## Why was this MR needed?

This code was untested and would execute more SQL queries than needed.

See merge request !6680</pre>
</div>
</content>
</entry>
<entry>
<title>Restore inexplicably removed code from requestFileSuccess.</title>
<updated>2016-10-05T10:48:18+00:00</updated>
<author>
<name>Bryce Johnson</name>
<email>bryce@gitlab.com</email>
</author>
<published>2016-10-05T10:48:18+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2d41c3f5a04ae9879749bb8f0d903c28212f4298'/>
<id>2d41c3f5a04ae9879749bb8f0d903c28212f4298</id>
<content type='text'>
(also clean up a few global refs)
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
(also clean up a few global refs)
</pre>
</div>
</content>
</entry>
<entry>
<title>Refactor Gitlab::Identifier</title>
<updated>2016-10-05T10:40:17+00:00</updated>
<author>
<name>Yorick Peterse</name>
<email>yorickpeterse@gmail.com</email>
</author>
<published>2016-10-04T16:03:10+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=16ed9b6129daf51a296d4576580c5f232d043db6'/>
<id>16ed9b6129daf51a296d4576580c5f232d043db6</id>
<content type='text'>
This refactors Gitlab::Identifier so it uses fewer queries and is
actually tested. Queries are reduced by caching the output as well as
using 1 query (instead of 2) to find a user using an SSH key.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This refactors Gitlab::Identifier so it uses fewer queries and is
actually tested. Queries are reduced by caching the output as well as
using 1 query (instead of 2) to find a user using an SSH key.
</pre>
</div>
</content>
</entry>
</feed>
