delta/gitlab/gitlab-ce.git, branch admin-nav gitlab.com: gitlab-org/gitlab-ce.git Update explore sidebar 2016-06-07T19:17:12+00:00 Annabel Dunstone annabel.dunstone@gmail.com 2016-06-07T19:17:12+00:00 2ffc459f34f2c259a7435121d0f18d3b1ff1a770 






Update admin sidebar
2016-06-07T19:16:34+00:00

Annabel Dunstone
annabel.dunstone@gmail.com

2016-06-07T19:16:34+00:00

f872f58738e27dff1d9a1b88ab6661239f6943cf












Merge branch 'load-knapsack-if-defined' into 'master'

2016-06-07T18:37:38+00:00

Stan Hu
stanhu@gmail.com

2016-06-07T18:37:38+00:00

2cbb17da31be0d18e8457232255da0bd5ac87db5


Load knapsack in Rakefile only when is bundled

Fixes `production` builds: https://dev.gitlab.org/gitlab/omnibus-gitlab/builds/85407

cc @marin 

See merge request !4514





Load knapsack in Rakefile only when is bundled

Fixes `production` builds: https://dev.gitlab.org/gitlab/omnibus-gitlab/builds/85407

cc @marin 

See merge request !4514






Merge branch 'notification-dropdown-labels' into 'master'

2016-06-07T18:06:37+00:00

Jacob Schatz
jschatz@gitlab.com

2016-06-07T18:06:37+00:00

babf20c8ab2c2186590758b193de953c5efdefb4


Notifications dropdown on project page now has descriptions

## What does this MR do?

Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense.

## What are the relevant issue numbers?

Part of #12758

## Screenshots (if relevant)

![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png)

See merge request !4374





Notifications dropdown on project page now has descriptions

## What does this MR do?

Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense.

## What are the relevant issue numbers?

Part of #12758

## Screenshots (if relevant)

![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png)

See merge request !4374






Load knapsack in Rakefile only when is bundled
2016-06-07T18:02:03+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-06-07T17:29:33+00:00

88b0a9efc44a792a7fd9f2263a1c85b9ef552504












Merge branch 'add-license-finder-to-contributing' into 'master'

2016-06-07T17:41:21+00:00

Stan Hu
stanhu@gmail.com

2016-06-07T17:41:21+00:00

40b17bdebd429c3d9693644404be8f56ff3ac441


Add License Finder information to contribution acceptance criteria.

To make it clear what should be done when the license finder test fails.

cc: @stanhu 

See merge request !4512





Add License Finder information to contribution acceptance criteria.

To make it clear what should be done when the license finder test fails.

cc: @stanhu 

See merge request !4512






Add License Finder information to contribution acceptance criteria.
2016-06-07T17:23:26+00:00

Connor Shea
connor.james.shea@gmail.com

2016-06-07T17:23:26+00:00

629b4e68e8f9f46ff81fabc2f439264e681dabcc












Merge branch '18058-sub-nav' into 'master'

2016-06-07T17:13:21+00:00

Jacob Schatz
jschatz@gitlab.com

2016-06-07T17:13:21+00:00

c3ce61ba41c58bcbb9120acc08538330a64ec334


Sub navigation

## What does this MR do?
Styles sub nav   
cc @dzaporozhets  @skyruler @jschatz1 

## What are the relevant issue numbers?
#18058 and #17983 

## Screenshots (if relevant)
![Screen_Shot_2016-06-03_at_12.10.26_PM](/uploads/8b948c32699a93ab0a390bda31e0e411/Screen_Shot_2016-06-03_at_12.10.26_PM.png)
![Screen_Shot_2016-06-03_at_12.10.34_PM](/uploads/241115c35d0618f3de739be9a670416d/Screen_Shot_2016-06-03_at_12.10.34_PM.png)

See merge request !4468





Sub navigation

## What does this MR do?
Styles sub nav   
cc @dzaporozhets  @skyruler @jschatz1 

## What are the relevant issue numbers?
#18058 and #17983 

## Screenshots (if relevant)
![Screen_Shot_2016-06-03_at_12.10.26_PM](/uploads/8b948c32699a93ab0a390bda31e0e411/Screen_Shot_2016-06-03_at_12.10.26_PM.png)
![Screen_Shot_2016-06-03_at_12.10.34_PM](/uploads/241115c35d0618f3de739be9a670416d/Screen_Shot_2016-06-03_at_12.10.34_PM.png)

See merge request !4468






Merge branch '18013-compact-sidebar' into 'master'

2016-06-07T17:00:44+00:00

Jacob Schatz
jschatz@gitlab.com

2016-06-07T17:00:44+00:00

7d315aecfbd807bcdb9131151e86e37c90603f70


Implement compact side nav

## What does this MR do?
Implements new compact nav design   
Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268)

## What are the relevant issue numbers?
Closes #18013 

## Screenshots (if relevant)
![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png)   
![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png)

cc @dzaporozhets 

See merge request !4447





Implement compact side nav

## What does this MR do?
Implements new compact nav design   
Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268)

## What are the relevant issue numbers?
Closes #18013 

## Screenshots (if relevant)
![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png)   
![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png)

cc @dzaporozhets 

See merge request !4447






Merge branch '18082-instrument-repositorycheck-singlerepositoryworker-manually' into 'master'

2016-06-07T16:56:01+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-06-07T16:56:01+00:00

99913b3d2ce1657a9521daa5504ee1dee002a286


Instrument `RepositoryCheck::SingleRepositoryWorker` manually

See merge request !4446





Instrument `RepositoryCheck::SingleRepositoryWorker` manually

See merge request !4446