delta/gitlab/gitlab-ce.git, branch fixed-layout-container

Put layout navigation in fixed width container

2016-06-10T17:11:09+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'labels-placement' into 'master'

2016-06-10T16:57:13+00:00


Move Labels and Milestones as sub tab to Issues/MR

## What does this MR do?

UI/UX change. Moves project labels and milestone tabs under Issues and Merge request tabs. 

## Why was this MR needed?

To solve problem of having to many tabs in top navigation. Since Labels and Milestones depends on Issue/MR feature it belongs to it and can be removed from top nav.

## What are the relevant issue numbers?

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18368

## 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) - not needed
- [x] API support added - not needed
- [x] Tests
  - [x] Added for this feature/bug - changed existing tests to match new behaviour
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)

cc @jschatz1 @annabeldunstone @skyruler

See merge request !4592

Merge branch 'workhorse-helpers' into 'master'

2016-06-10T16:21:26+00:00


Add workhorse controller and API helpers

Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with.

See merge request !4486

Add CHANGELOG item for labels/milestones navigation change

2016-06-10T16:15:23+00:00

Signed-off-by: Dmitriy Zaporozhets

Render issues link on issues subnav unless you visit merge request controller

2016-06-10T16:15:23+00:00

Signed-off-by: Dmitriy Zaporozhets

Render only issues/mr in subnav depends on context

2016-06-10T16:15:23+00:00

Signed-off-by: Dmitriy Zaporozhets

Move Labels and Milestones as sub tab to Issues/MR

2016-06-10T16:15:23+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'ci-page-ui-update' into 'master'

2016-06-10T15:44:21+00:00


CI build page UI update

Closes #2569 

See merge request !3829

Merge branch 'icon-color-fix' into 'master'

2016-06-10T15:39:13+00:00


Update activity SVG path

## What does this MR do?
Fixes SVG path so the activity icon is the correct color

## Screenshots (if relevant)



See merge request !4563

Merge branch 'prettier-awardable-button-active' into 'master'

2016-06-10T15:38:52+00:00


Made the awardable buttons prettier when active

## What does this MR do?

Made the active and hover state of the award emoji buttons prettier.

## Why was this MR needed?

'cause @JobV wanted them to look nicer :wink: 

## What are the relevant issue numbers?

Closes #18379 

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_09.10.44](/uploads/5ecd0f12679e3484de1ab1d2dbe50cd8/Screen_Shot_2016-06-09_at_09.10.44.png)

See merge request !4554