<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/views, branch 22964-git-commit-documentation-article</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 '22343-honor-user-fixed-layout-pref' into 'master'</title>
<updated>2016-10-04T11:58:15+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-10-04T11:58:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=88fa5916ffa0aea491cd339272ed7437c3f52dc7'/>
<id>88fa5916ffa0aea491cd339272ed7437c3f52dc7</id>
<content type='text'>

Ensure the 'fixed layout' preference is honored whenever possible

## What does this MR do?

Currently, when viewing any Merge Request the user's fixed-layout preference is overridden if they have set "Side-by-Side" view as their preference when viewing diffs.  This makes sense if they are currently viewing a diff, but this is confusing when their layout preference is overridden while they are on another tab (i.e. "Discussion" or "Builds").

This MR moves all responsibility for overriding the fixed layout from the Ruby page layout helper into frontend JavaScript where it is only applied when needed.

## Are there points in the code the reviewer needs to double check?

Check that nothing broke for users which have their layout preference set to "Fluid" as well as those which have it set to "Fixed".  I've already done this but double checking is always good idea :smile:.

## Screenshots (if relevant)

![side-by-side-toggle-fixed](/uploads/033dc73e70b73da5692b75606733c938/side-by-side-toggle-fixed.gif)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [ ] 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)

## What are the relevant issue numbers?

Closes #22343 

## Other Notes

As @lbennett noted in #22343, this is something of a band-aid.  It fixed most of the issue, but we still need to have a discussion about whether or not is acceptable to override user layout preferences for "Side-by-Side" views in general.  At least this MR limits the scope of this behavior to a single tab within an MR or merge conflict page.

See merge request !6422</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Ensure the 'fixed layout' preference is honored whenever possible

## What does this MR do?

Currently, when viewing any Merge Request the user's fixed-layout preference is overridden if they have set "Side-by-Side" view as their preference when viewing diffs.  This makes sense if they are currently viewing a diff, but this is confusing when their layout preference is overridden while they are on another tab (i.e. "Discussion" or "Builds").

This MR moves all responsibility for overriding the fixed layout from the Ruby page layout helper into frontend JavaScript where it is only applied when needed.

## Are there points in the code the reviewer needs to double check?

Check that nothing broke for users which have their layout preference set to "Fluid" as well as those which have it set to "Fixed".  I've already done this but double checking is always good idea :smile:.

## Screenshots (if relevant)

![side-by-side-toggle-fixed](/uploads/033dc73e70b73da5692b75606733c938/side-by-side-toggle-fixed.gif)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [ ] 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)

## What are the relevant issue numbers?

Closes #22343 

## Other Notes

As @lbennett noted in #22343, this is something of a band-aid.  It fixed most of the issue, but we still need to have a discussion about whether or not is acceptable to override user layout preferences for "Side-by-Side" views in general.  At least this MR limits the scope of this behavior to a single tab within an MR or merge conflict page.

See merge request !6422</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'todo-issue-due-date' into 'master'</title>
<updated>2016-10-04T09:45:04+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-10-04T09:45:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=006cd7f7b29fbe8f566ff72afb9236e90502d8ca'/>
<id>006cd7f7b29fbe8f566ff72afb9236e90502d8ca</id>
<content type='text'>

Todo issue due date

## What does this MR do?

Adds the text 'Due today' or 'Due [DATE]' next to issues in todos.
This does not add anyway to filter by due date - little steps.

## What are the relevant issue numbers?

#18218

See merge request !6351</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Todo issue due date

## What does this MR do?

Adds the text 'Due today' or 'Due [DATE]' next to issues in todos.
This does not add anyway to filter by due date - little steps.

## What are the relevant issue numbers?

#18218

See merge request !6351</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '22805-container-registry-status' into 'master'</title>
<updated>2016-10-04T08:42:39+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-10-04T08:42:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ccd89ec965aa26812b4e48aabc15ca1594914b66'/>
<id>ccd89ec965aa26812b4e48aabc15ca1594914b66</id>
<content type='text'>

Add Container Registry on/off status to admin area

## What are the relevant issue numbers?

Closes #22805

See merge request !6638</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add Container Registry on/off status to admin area

## What are the relevant issue numbers?

Closes #22805

See merge request !6638</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '22006-change-build-wording-to-pipeline-in-mr-block-add-pipeline-id' into 'master'</title>
<updated>2016-10-03T22:30:20+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-10-03T22:30:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ffdc854d57c28ce5037c6dccf473fa6616afd7f2'/>
<id>ffdc854d57c28ce5037c6dccf473fa6616afd7f2</id>
<content type='text'>

Changed mr widget build status to pipeline status

## What does this MR do?

Changed mr widget build status to pipeline status with pipeline id, with a link to the pipeline.

## Are there points in the code the reviewer needs to double check?

Do we want the link to the pipeline?

/cc @dimitrieh 

## Screenshots (if relevant)

![Screen_Shot_2016-09-14_at_02.42.23](/uploads/94a860361ab70eccf966e519764c6ec5/Screen_Shot_2016-09-14_at_02.42.23.png)

## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 #22006

See merge request !6335</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Changed mr widget build status to pipeline status

## What does this MR do?

Changed mr widget build status to pipeline status with pipeline id, with a link to the pipeline.

## Are there points in the code the reviewer needs to double check?

Do we want the link to the pipeline?

/cc @dimitrieh 

## Screenshots (if relevant)

![Screen_Shot_2016-09-14_at_02.42.23](/uploads/94a860361ab70eccf966e519764c6ec5/Screen_Shot_2016-09-14_at_02.42.23.png)

## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 #22006

See merge request !6335</pre>
</div>
</content>
</entry>
<entry>
<title>Add Container Registry on/off status to admin area</title>
<updated>2016-10-03T14:53:59+00:00</updated>
<author>
<name>the-undefined</name>
<email>joe@joejames.io</email>
</author>
<published>2016-10-02T13:42:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2a7f82f8e4b0a89653cd21a3a1c34b51f3b4c141'/>
<id>2a7f82f8e4b0a89653cd21a3a1c34b51f3b4c141</id>
<content type='text'>
Display the on/off icon under the "Features" section of the admin area
for the Container Registry.

Closes !22805
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Display the on/off icon under the "Features" section of the admin area
for the Container Registry.

Closes !22805
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/import-export-admin' into 'master'</title>
<updated>2016-10-03T11:45:01+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-10-03T11:45:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8c5701b622a12ebc79a88e65baaf29549c5be1da'/>
<id>8c5701b622a12ebc79a88e65baaf29549c5be1da</id>
<content type='text'>

Enable Import/Export for non-admin users

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315

Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/

See merge request !6080</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Enable Import/Export for non-admin users

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315

Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/

See merge request !6080</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'group-empty-state' into 'master'</title>
<updated>2016-10-03T11:42:22+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-10-03T11:42:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9d0757a292bd6344f235fe2349da6662cf957347'/>
<id>9d0757a292bd6344f235fe2349da6662cf957347</id>
<content type='text'>

Better empty state for Groups view.

Implemented @hazelyang's [awesome design](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png) for empty group views.

Fixes #20829 


### Design
![https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png)


### Screenshots
![Screen_Shot_2016-09-28_at_13.43.35](/uploads/e2ab668a412596205deb67c97af78a1d/Screen_Shot_2016-09-28_at_13.43.35.png)

![Screen_Shot_2016-09-28_at_13.44.54](/uploads/c4301166f353f0ee198aecdc46cdfe66/Screen_Shot_2016-09-28_at_13.44.54.png)

![Screen_Shot_2016-09-28_at_13.46.10](/uploads/92024e866871969ec7a28db4b8e87220/Screen_Shot_2016-09-28_at_13.46.10.png)

![Screen_Shot_2016-09-28_at_13.46.20](/uploads/f1b515c7aa09d06e80a419d98ff76fd6/Screen_Shot_2016-09-28_at_13.46.20.png)

![Screen_Shot_2016-09-28_at_13.46.34](/uploads/76cdd5f0e9d3c59d017df26172f7dd4d/Screen_Shot_2016-09-28_at_13.46.34.png)

See merge request !6566</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Better empty state for Groups view.

Implemented @hazelyang's [awesome design](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png) for empty group views.

Fixes #20829 


### Design
![https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9141470ed121f137a4074ae4e12c449c/groups-empty.png)


### Screenshots
![Screen_Shot_2016-09-28_at_13.43.35](/uploads/e2ab668a412596205deb67c97af78a1d/Screen_Shot_2016-09-28_at_13.43.35.png)

![Screen_Shot_2016-09-28_at_13.44.54](/uploads/c4301166f353f0ee198aecdc46cdfe66/Screen_Shot_2016-09-28_at_13.44.54.png)

![Screen_Shot_2016-09-28_at_13.46.10](/uploads/92024e866871969ec7a28db4b8e87220/Screen_Shot_2016-09-28_at_13.46.10.png)

![Screen_Shot_2016-09-28_at_13.46.20](/uploads/f1b515c7aa09d06e80a419d98ff76fd6/Screen_Shot_2016-09-28_at_13.46.20.png)

![Screen_Shot_2016-09-28_at_13.46.34](/uploads/76cdd5f0e9d3c59d017df26172f7dd4d/Screen_Shot_2016-09-28_at_13.46.34.png)

See merge request !6566</pre>
</div>
</content>
</entry>
<entry>
<title>Fixes sidebar navigation.</title>
<updated>2016-10-03T09:38:21+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-10-03T09:38:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=729cb3b319227dca2cdf5bd211519615a92e328f'/>
<id>729cb3b319227dca2cdf5bd211519615a92e328f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Moved middot into helper method</title>
<updated>2016-10-03T09:08:34+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-10-03T09:08:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=06fdfc7395681ee6dca6f1b9d998cdbeb57b0a24'/>
<id>06fdfc7395681ee6dca6f1b9d998cdbeb57b0a24</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Moved todo due date to helper method</title>
<updated>2016-10-03T08:58:55+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-10-03T08:58:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8ea18c37611ccb86b286761cc373c01199d64878'/>
<id>8ea18c37611ccb86b286761cc373c01199d64878</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
