<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch update-templates</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>Update templates.</title>
<updated>2016-09-01T23:20:40+00:00</updated>
<author>
<name>Ruben Davila</name>
<email>rdavila84@gmail.com</email>
</author>
<published>2016-09-01T23:20:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0c36469538631ed7729d1faae9c610d3453869b8'/>
<id>0c36469538631ed7729d1faae9c610d3453869b8</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 '8-11-4-changelog' into 'master'</title>
<updated>2016-09-01T22:25:31+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2016-09-01T22:25:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=33a367e828c95ba7321d33361be67c68b1603bdd'/>
<id>33a367e828c95ba7321d33361be67c68b1603bdd</id>
<content type='text'>

Update CHANGELOG with 8.11.4 entries.



See merge request !6159</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update CHANGELOG with 8.11.4 entries.



See merge request !6159</pre>
</div>
</content>
</entry>
<entry>
<title>Update CHANGELOG with 8.11.4 entries.</title>
<updated>2016-09-01T22:22:03+00:00</updated>
<author>
<name>Ruben Davila</name>
<email>rdavila84@gmail.com</email>
</author>
<published>2016-09-01T22:22:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=818c3f79f74f205f9e8762c4eab3ace28f311797'/>
<id>818c3f79f74f205f9e8762c4eab3ace28f311797</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 'remove-inconsistent-font-weight-sidebar-label' into 'master'</title>
<updated>2016-09-01T22:05:33+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-09-01T22:05:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2c3e1ae432f66738cfd73b56f2c657fb313dc7fb'/>
<id>2c3e1ae432f66738cfd73b56f2c657fb313dc7fb</id>
<content type='text'>

Remove inconsistent font weight for sidebar's labels

## What does this MR do?
Removes the `.bold` css class from the sidebar label default value so that it is no longer bold :smile: 

**None** =&gt; None

## Are there points in the code the reviewer needs to double check?
None

## Why was this MR needed?
Fixes a UI inconsistency

## What are the relevant issue numbers?
Closes #21141 

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-24_at_9.41.11_AM](/uploads/3e416d45531b7322474922c569225c03/Screen_Shot_2016-08-24_at_9.41.11_AM.png)

After:
![Screen_Shot_2016-08-24_at_9.40.57_AM](/uploads/a4d60d4cd0a57142ad6c0c8a25be5342/Screen_Shot_2016-08-24_at_9.40.57_AM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [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)

See merge request !5984</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Remove inconsistent font weight for sidebar's labels

## What does this MR do?
Removes the `.bold` css class from the sidebar label default value so that it is no longer bold :smile: 

**None** =&gt; None

## Are there points in the code the reviewer needs to double check?
None

## Why was this MR needed?
Fixes a UI inconsistency

## What are the relevant issue numbers?
Closes #21141 

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-24_at_9.41.11_AM](/uploads/3e416d45531b7322474922c569225c03/Screen_Shot_2016-08-24_at_9.41.11_AM.png)

After:
![Screen_Shot_2016-08-24_at_9.40.57_AM](/uploads/a4d60d4cd0a57142ad6c0c8a25be5342/Screen_Shot_2016-08-24_at_9.40.57_AM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [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)

See merge request !5984</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-checkbox-alignment' into 'master'</title>
<updated>2016-09-01T22:01:19+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-09-01T22:01:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9921f25295152f5cccacf63a94606b0877348a18'/>
<id>9921f25295152f5cccacf63a94606b0877348a18</id>
<content type='text'>

Fix inconsistent checkbox alignment

## What does this MR do?
Vertically aligns the checkboxes to the top so that it is aligned with the issue titles

## Are there points in the code the reviewer needs to double check?
None

## Why was this MR needed?
Fixes existing UI inconsistency

## What are the relevant issue numbers?
Closes #21398

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-25_at_12.43.21_PM](/uploads/c494d6200e2068feb324db932851cdc0/Screen_Shot_2016-08-25_at_12.43.21_PM.png)

After:
![Screen_Shot_2016-08-25_at_12.41.51_PM](/uploads/42241a150c886592ff92a5840090c589/Screen_Shot_2016-08-25_at_12.41.51_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [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)

See merge request !6032</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix inconsistent checkbox alignment

## What does this MR do?
Vertically aligns the checkboxes to the top so that it is aligned with the issue titles

## Are there points in the code the reviewer needs to double check?
None

## Why was this MR needed?
Fixes existing UI inconsistency

## What are the relevant issue numbers?
Closes #21398

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-25_at_12.43.21_PM](/uploads/c494d6200e2068feb324db932851cdc0/Screen_Shot_2016-08-25_at_12.43.21_PM.png)

After:
![Screen_Shot_2016-08-25_at_12.41.51_PM](/uploads/42241a150c886592ff92a5840090c589/Screen_Shot_2016-08-25_at_12.41.51_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [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)

See merge request !6032</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'users-es6' into 'master'</title>
<updated>2016-09-01T21:52:12+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-09-01T21:52:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0b4b3833935777880d5ddf6d6fb404a0a6bc44c9'/>
<id>0b4b3833935777880d5ddf6d6fb404a0a6bc44c9</id>
<content type='text'>

Front End - Rewrote ES5 `user.js` to ES6 `user.js.es6`

## What does this MR do?

This MR removes the `users.js` file in `app/assets/javascripts/users.js` and replaces it with ES6.

* It also adds the file extension `.es6` so that the sprockets babel gem can transpile it to ES5.
* The new file is: `users.js.es6` in `app/assets/javascripts/`
* Replaced `new User` with `new gl.User` in `app/views/users/show.html.haml`

## Are there points in the code the reviewer needs to double check?

I followed the AirBnb guide, but if there are any mistakes let me know!

## Why was this MR needed?

Because the entire coffee script codebase was transferred over to ES5 with a plan to move everything over to ES6 :smile: 

## What are the relevant issue numbers?

#20098 

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- Tests
  - [x] All builds are passing
- [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)

See merge request !5676</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Front End - Rewrote ES5 `user.js` to ES6 `user.js.es6`

## What does this MR do?

This MR removes the `users.js` file in `app/assets/javascripts/users.js` and replaces it with ES6.

* It also adds the file extension `.es6` so that the sprockets babel gem can transpile it to ES5.
* The new file is: `users.js.es6` in `app/assets/javascripts/`
* Replaced `new User` with `new gl.User` in `app/views/users/show.html.haml`

## Are there points in the code the reviewer needs to double check?

I followed the AirBnb guide, but if there are any mistakes let me know!

## Why was this MR needed?

Because the entire coffee script codebase was transferred over to ES5 with a plan to move everything over to ES6 :smile: 

## What are the relevant issue numbers?

#20098 

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- Tests
  - [x] All builds are passing
- [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)

See merge request !5676</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'issue-boards-issues-total-count' into 'master'</title>
<updated>2016-09-01T21:32:44+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-09-01T21:32:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f90c6a24b469cb1fe939f6e8fba5a835c62e477f'/>
<id>f90c6a24b469cb1fe939f6e8fba5a835c62e477f</id>
<content type='text'>

Add the total number of issues in the JSON response in issue board lists

## What does this MR do?

Add the total number of issues in the JSON response in issue board lists

## Why was this MR needed?

The issue board lists should always show the total number of issues in the list, not the current amount fetched by endless scroll.

Closes #21327

See merge request !5904</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add the total number of issues in the JSON response in issue board lists

## What does this MR do?

Add the total number of issues in the JSON response in issue board lists

## Why was this MR needed?

The issue board lists should always show the total number of issues in the list, not the current amount fetched by endless scroll.

Closes #21327

See merge request !5904</pre>
</div>
</content>
</entry>
<entry>
<title>removed null return - renamed 'placeTop' to 'placeProfileAvatarsToTop'</title>
<updated>2016-09-01T20:51:53+00:00</updated>
<author>
<name>Regis</name>
<email>boudinot.regis@yahoo.com</email>
</author>
<published>2016-09-01T20:51:53+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f43a0470bd52132c2853582c51637a736dcce5e8'/>
<id>f43a0470bd52132c2853582c51637a736dcce5e8</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 '21781-pipelines-for-mr' into 'master'</title>
<updated>2016-09-01T20:25:01+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-09-01T20:25:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2038e86772b3a7a02df5b01e454400e7d9314312'/>
<id>2038e86772b3a7a02df5b01e454400e7d9314312</id>
<content type='text'>

Change widths of content in MR pipeline tab

## What does this MR do?
* Fixes width of items in pipelines tab
* Removes scrollbars on Windows

## Screenshots (if relevant)
![Screen_Shot_2016-09-01_at_2.40.55_PM](/uploads/2163022eb325b9b0eca2f2003416e100/Screen_Shot_2016-09-01_at_2.40.55_PM.png)

#### What are the relevant issue numbers?
Closes #21396 
Closes #21781

See merge request !6157</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Change widths of content in MR pipeline tab

## What does this MR do?
* Fixes width of items in pipelines tab
* Removes scrollbars on Windows

## Screenshots (if relevant)
![Screen_Shot_2016-09-01_at_2.40.55_PM](/uploads/2163022eb325b9b0eca2f2003416e100/Screen_Shot_2016-09-01_at_2.40.55_PM.png)

#### What are the relevant issue numbers?
Closes #21396 
Closes #21781

See merge request !6157</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '21508-inconsistency-personal-dashboard-todos-page-uses-old-interface-wrong-dropdown-filter-buttons' into 'master'</title>
<updated>2016-09-01T20:17:46+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-09-01T20:17:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b211887282409a7a5209514b388e3cc2e16f6ba0'/>
<id>b211887282409a7a5209514b388e3cc2e16f6ba0</id>
<content type='text'>

Update todo view filter dropdowns

## What does this MR do?

Swaps out old `select2` dropdowns on todo page with newer dropdowns.

Also removes todo inline JS.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

### Project

![2016-08-29_14.02.57](/uploads/73d610fd41d202540f3770afa7e5266f/2016-08-29_14.02.57.gif)

### Author

![2016-08-29_14.03.40](/uploads/8ce97b81c91db06111f6a930cd5fb293/2016-08-29_14.03.40.gif)

### Type

![2016-08-29_14.04.32](/uploads/1aa050a7822de1d99ee7fdc3bbc621a3/2016-08-29_14.04.32.gif)

### Action

![2016-08-29_14.05.23](/uploads/680d19c56723a222274c3677f941cfcd/2016-08-29_14.05.23.gif)

## Does this MR meet the acceptance criteria?

- [ ] [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
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #21508 

Related to #19866

See merge request !6072</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update todo view filter dropdowns

## What does this MR do?

Swaps out old `select2` dropdowns on todo page with newer dropdowns.

Also removes todo inline JS.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

### Project

![2016-08-29_14.02.57](/uploads/73d610fd41d202540f3770afa7e5266f/2016-08-29_14.02.57.gif)

### Author

![2016-08-29_14.03.40](/uploads/8ce97b81c91db06111f6a930cd5fb293/2016-08-29_14.03.40.gif)

### Type

![2016-08-29_14.04.32](/uploads/1aa050a7822de1d99ee7fdc3bbc621a3/2016-08-29_14.04.32.gif)

### Action

![2016-08-29_14.05.23](/uploads/680d19c56723a222274c3677f941cfcd/2016-08-29_14.05.23.gif)

## Does this MR meet the acceptance criteria?

- [ ] [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
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #21508 

Related to #19866

See merge request !6072</pre>
</div>
</content>
</entry>
</feed>
