summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update explore sidebaradmin-navAnnabel Dunstone2016-06-071-4/+4
|
* Update admin sidebarAnnabel Dunstone2016-06-071-23/+19
|
* Merge branch 'load-knapsack-if-defined' into 'master' Stan Hu2016-06-072-3/+2
|\ | | | | | | | | | | | | | | | | 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 bundledload-knapsack-if-definedKamil Trzcinski2016-06-072-3/+2
| |
* | Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz2016-06-076-12/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Updated colorsnotification-dropdown-labelsPhil Hughes2016-06-071-0/+2
| | |
| * | Fixed failing testsPhil Hughes2016-06-072-2/+2
| | |
| * | CHANGELOG itemPhil Hughes2016-06-071-0/+1
| | |
| * | Notifications dropdown on project page now has descriptionsPhil Hughes2016-06-074-11/+43
| | | | | | | | | | | | This is part of #12758
* | | Merge branch 'add-license-finder-to-contributing' into 'master' Stan Hu2016-06-071-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Connor Shea2016-06-071-0/+2
| | | |
* | | | Merge branch '18058-sub-nav' into 'master' Jacob Schatz2016-06-0715-266/+345
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix alignment of wiki top areaAnnabel Dunstone2016-06-072-1/+5
| | | |
| * | | Align links and tabs18058-sub-navAnnabel Dunstone2016-06-071-3/+6
| | | |
| * | | Add scrolling tabs to code subnavAnnabel Dunstone2016-06-072-20/+41
| | | |
| * | | Finish styling sub navAnnabel Dunstone2016-06-0711-211/+234
| | | |
| * | | Start styling sub navAnnabel Dunstone2016-06-074-52/+80
| |/ /
* | | Merge branch '18013-compact-sidebar' into 'master' Jacob Schatz2016-06-078-163/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Update charcoal theme colors18013-compact-sidebarAnnabel Dunstone2016-06-071-2/+5
| | | |
| * | | Update nav link font size and spacing; fix hamburger iconAnnabel Dunstone2016-06-073-24/+17
| | | |
| * | | Fix control btn positionAnnabel Dunstone2016-06-071-1/+1
| | | |
| * | | Remove todos count tests in navAnnabel Dunstone2016-06-071-2/+0
| | | |
| * | | Test impersonation using img data attribute instead of usernameAnnabel Dunstone2016-06-072-5/+5
| | | |
| * | | Implement compact side navAnnabel Dunstone2016-06-075-143/+47
| |/ /
* | | Merge branch ↵Yorick Peterse2016-06-072-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18082-instrument-repositorycheck-singlerepositoryworker-manually' into 'master' Instrument `RepositoryCheck::SingleRepositoryWorker` manually See merge request !4446
| * | | Instrument `RepositoryCheck::SingleRepositoryWorker` manuallyAlejandro Rodríguez2016-06-072-0/+8
| |/ / | | | | | | | | | This worker is called manually by `RepositoryCheck::BatchWorker` meaning it's not tracked automatically by the Sidekiq middleware.
* | | Merge branch 'refactor/ci-config-add-facade' into 'master' Rémy Coutable2016-06-075-7/+141
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new GitLab CI configuration facade class ## What does this MR do? This MR is a first iteration of major CI configuration refactoring. See #17139 and #15060 for more details. ## What are the relevant issue numbers? Closes #17139 See merge request !4462
| * | Improve Ci config loader by changing method signaturerefactor/ci-config-add-facadeGrzegorz Bizon2016-06-073-6/+6
| | |
| * | Remove duplicated exception in Ci configGrzegorz Bizon2016-06-073-7/+3
| | | | | | | | | | | | | | | This is a temporary refactoring stub, that is planned to be removed after removing legacy config processor.
| * | Rename class that loads CI configuration to LoaderGrzegorz Bizon2016-06-065-23/+19
| | |
| * | Extract CI config YAML parser to a separate classGrzegorz Bizon2016-06-034-5/+96
| | | | | | | | | | | | | | | With this approach it would be easier to add different sources of configuration, that we do not necessairly have to be in YAML format.
| * | Add gitlab ci configuration class that holds hashGrzegorz Bizon2016-06-033-7/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | As for now, we keep this class inside a oryginal config processor class. We will move implementation to this class and delegate to it from current config processor. After original gitlab ci yaml processor not longer has relevant impelemntation we will replace it with new configuration class.
* | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-0725-34/+556
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ability to prioritize labels Closes #14189 See merge request !4009
| * | | Fix label order by priority on labels pageissue_14189Sean McGivern2016-06-073-3/+63
| | | |
| * | | TypoAlfredo Sumaran2016-06-062-4/+4
| | | |
| * | | Clarify issue priority specSean McGivern2016-06-061-14/+7
| | | | | | | | | | | | | | | | | | | | We don't care particularly about the ordering within a priority level, just that the levels are in the right order.
| * | | Remove unnecessary null-specific orderSean McGivern2016-06-061-2/+2
| | | |
| * | | Tidy up Ruby style in templatesSean McGivern2016-06-062-6/+5
| | | |
| * | | Remove commentAlfredo Sumaran2016-06-061-1/+0
| | | | | | | | | | | | | | | | Just to trigger CI
| * | | Add test for the case when user can't prioritize labelsAlfredo Sumaran2016-06-061-47/+77
| | | |
| * | | Initialize LabelManager only when necessaryAlfredo Sumaran2016-06-061-1/+1
| | | |
| * | | Show functionality only for users with the ability to edit labelsAlfredo Sumaran2016-06-062-18/+21
| | | |
| * | | Improve functionalityAlfredo Sumaran2016-06-061-18/+21
| | | |
| * | | add :set_priorities to :authorize_admin_labels!Alfredo Sumaran2016-06-061-1/+1
| | | |
| * | | typoAlfredo Sumaran2016-06-061-1/+1
| | | |
| * | | Show prioritized labels only on the first page and when there's labels createdAlfredo Sumaran2016-06-061-1/+4
| | | |
| * | | Remove unnecesary paramAlfredo Sumaran2016-06-061-1/+1
| | | |
| * | | TypoAlfredo Sumaran2016-06-061-2/+2
| | | |
| * | | Update method and routeAlfredo Sumaran2016-06-062-3/+3
| | | |
| * | | Update method nameAlfredo Sumaran2016-06-061-2/+2
| | | |
View Lorry Controller Status