summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make header into links; CSS tweaks34024-sidebar-headerAnnabel Dunstone Gray2017-06-285-9/+14
* Add context header to sidebarAnnabel Dunstone Gray2017-06-275-1/+43
* Fix karma specsAnnabel Dunstone Gray2017-06-272-2/+2
* Add sidebar to user profile settingsAnnabel Dunstone Gray2017-06-272-1/+54
* Fix CSS according to ux feedbackAnnabel Dunstone Gray2017-06-271-5/+5
* Use new sidebar for pagesAnnabel Dunstone Gray2017-06-274-7/+10
* Add admin dropdown items to main sidebarAnnabel Dunstone Gray2017-06-271-0/+26
* Create sidebars for groups and admin pagesAnnabel Dunstone Gray2017-06-277-6/+166
* Revert margin changeAnnabel Dunstone Gray2017-06-272-1/+5
* Fix specs; remove extra padding on mobileAnnabel Dunstone Gray2017-06-273-4/+8
* More sidebar stylingAnnabel Dunstone Gray2017-06-274-52/+147
* Use bootstrap accordions to display nav dropdownsAnnabel Dunstone Gray2017-06-272-53/+54
* Fix right sidebar; add gutter if sidebar existsAnnabel Dunstone Gray2017-06-273-12/+15
* Add basic side nav if new nav enabledAnnabel Dunstone Gray2017-06-275-0/+264
* Merge branch 'fix/gb/qa/use-latest-chrome-version-in-qa-dockerfile' into 'mas...Rémy Coutable2017-06-271-10/+3
|\
| * Use latest chrome and chrome driver in GitLab QAfix/gb/qa/use-latest-chrome-version-in-qa-dockerfileGrzegorz Bizon2017-06-271-10/+3
* | Merge branch 'issue-form-multiple-line-markdown' into 'master'Filipa Lacerda2017-06-273-38/+75
|\ \
| * | Fixed multi-line markdown in issue edit formissue-form-multiple-line-markdownPhil Hughes2017-06-263-38/+75
* | | Merge branch 'zj-review-apps-usage-data' into 'master'Grzegorz Bizon2017-06-274-0/+7
|\ \ \
| * | | Add in_review_folder to usage pingzj-review-apps-usage-dataZ.J. van de Weg2017-06-274-0/+7
* | | | Merge branch '34168-cannot-edit-prioritized-labels-issues-with-firefox' into ...Phil Hughes2017-06-274-3/+10
|\ \ \ \
| * | | | Action Buttons on Prio Labels working again by setting pointer events to none...Tim Zallmann2017-06-274-3/+10
|/ / / /
* | | | Merge branch '34324-gitlab-db-seed-is-broken' into 'master'Rémy Coutable2017-06-272-1/+5
|\ \ \ \
| * | | | Fix Gitlab::Database.bulk_insert for non-UTF-8 data34324-gitlab-db-seed-is-brokenSean McGivern2017-06-262-1/+5
* | | | | Merge branch 'pat-alert-when-signin-disabled' into 'master'Rémy Coutable2017-06-2711-31/+274
|\ \ \ \ \
| * | | | | Provide hint to create a personal access token for Git over HTTPRobin Bobbitt2017-06-2611-31/+274
* | | | | | Merge branch 'sh-unset-stubenv' into 'master'Rémy Coutable2017-06-271-0/+8
|\ \ \ \ \ \
| * | | | | | Reset the state of StubENV's @env_already_stubbed after each spec runsh-unset-stubenvStan Hu2017-06-261-0/+8
* | | | | | | Merge branch 'fix-33991' into 'master'Sean McGivern2017-06-274-23/+86
|\ \ \ \ \ \ \
| * | | | | | | Fix missing hidden class when subscribed to a group labelfix-33991Douglas Barbosa Alexandre2017-06-261-3/+3
| * | | | | | | Fix LabelsHelper#toggle_subscription_label_pathDouglas Barbosa Alexandre2017-06-261-4/+6
| * | | | | | | Fix LabelsHelper#can_subscribe_to_label_in_different_levelsDouglas Barbosa Alexandre2017-06-261-1/+1
| * | | | | | | Improve scenario description for the group labels subscription specDouglas Barbosa Alexandre2017-06-261-1/+1
| * | | | | | | Add can_subscribe_to_label_in_different_levels helper methodDouglas Barbosa Alexandre2017-06-262-12/+16
| * | | | | | | Extract common paths to a variableDouglas Barbosa Alexandre2017-06-261-4/+5
| * | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2017-06-261-0/+4
| * | | | | | | Allow users to subscribe to group labels on group labels pageDouglas Barbosa Alexandre2017-06-263-16/+68
* | | | | | | | Merge branch '23036-replace-dashboard-todo-spinach' into 'master'Rémy Coutable2017-06-279-618/+399
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Replaces 'dashboard/todos' spinach with rspecAlexander Randa2017-06-269-618/+399
* | | | | | | | Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'Sean McGivern2017-06-277-3/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-databaseAdam Niedzielski2017-06-267-3/+63
* | | | | | | | | Merge branch '34282-fix-api-using-include_missing-false' into 'master'Grzegorz Bizon2017-06-273-1/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add changelog entryLin Jen-Shin2017-06-271-0/+4
| * | | | | | | | | Fix optional args for POST :id/variablesLin Jen-Shin2017-06-272-1/+12
* | | | | | | | | | Merge branch 'winh-mr-widget-no-pipeline' into 'master'Phil Hughes2017-06-272-19/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle Promise rejections in mr_widget_pipeline_spec.jswinh2017-06-261-24/+35
| * | | | | | | | | | Handle missing pipeline in merge request widgetwinh2017-06-261-1/+8
| * | | | | | | | | | Add failing test for #32987winh2017-06-221-0/+19
* | | | | | | | | | | Merge branch 'polish-sidebar-toggle' into 'master'Phil Hughes2017-06-277-3/+65
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Polish sidebar toggleClement Ho2017-06-277-3/+65
|/ / / / / / / / / /