summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Fix dropdown from project welcome page moving out of the screenjivl-fix-dropdown-going-out-of-screenJose2018-06-151-2/+2
* Resolve "Tab active state is not changing correctly on new merge request page"Jan2018-06-141-1/+1
* Resolve "Scrolling tabs are broken on profile, activity, and projects"Simon Knox2018-06-131-20/+19
* Updated the styling for modal titlessamdbeckham2018-06-011-1/+1
* Updates a load of modal headers to use better markupsamdbeckham2018-06-011-1/+2
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-0/+2
* Merge branch 'master' into bootstrap4Clement Ho2018-05-241-1/+1
|\
| * Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'Mike Greiling2018-05-241-1/+1
| |\
| | * Closes MR check out branch modal with escapeJacopo2018-05-221-1/+1
* | | Fix alignment of MR conflict resolutionAnnabel Dunstone Gray2018-05-231-1/+1
* | | Merge branch 'master' into bootstrap4Clement Ho2018-05-222-6/+14
|\ \ \ | |/ /
| * | Fix sentence for i18n44895-explicit-merge-conflictAnnabel Dunstone Gray2018-05-211-6/+4
| * | Add internationlization for conflict descriptionAnnabel Dunstone Gray2018-05-211-4/+4
| * | Update copy; add monospace font to branch namesAnnabel Dunstone Gray2018-05-212-5/+5
| * | Make source branch a linkAnnabel Dunstone Gray2018-05-211-1/+1
| * | Fix merge conflict infoAnnabel Dunstone Gray2018-05-211-1/+7
| * | Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-211-4/+8
| |/
* | Remove .form-inline from compare branch pageAnnabel Dunstone Gray2018-05-181-1/+1
* | Add <pre> styles and fix check out branch modalAnnabel Dunstone Gray2018-05-141-1/+1
* | Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-103-5/+5
* | Merge branch 'master' into bootstrap4Clement Ho2018-05-082-23/+19
|\ \ | |/
| * Improved commit message body renderingConstance Okoghenun2018-05-071-2/+2
| * Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-022-20/+16
* | Revert .hide to .d-none conversionClement Ho2018-04-241-1/+1
* | Fix dropdown alignments in new compareClement Ho2018-04-201-2/+2
* | Add .nav.nav-tabs to nav-linksClement Ho2018-04-192-2/+2
* | Merge branch 'master' into bootstrap4Clement Ho2018-04-191-1/+1
|\ \ | |/
| * Resolve "Improve tooltips of collapsed sidebars"Dennis Tang2018-04-191-1/+1
* | Fix merge request tabsClement Ho2018-04-191-1/+1
* | Set html:true for tooltipsClement Ho2018-04-191-1/+1
* | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-182-5/+5
|\ \ | |/
| * Merge branch '45446-new-sha-widget-breaks-on-new-merge-request' into 'master'Filipa Lacerda2018-04-181-1/+1
| |\
| | * fix regression in new merge request screenLukas Eipert2018-04-171-1/+1
| * | Merge branch 'blackst0ne-rails5-add-safe-params-helper' into 'master'Sean McGivern2018-04-181-4/+4
| |\ \ | | |/ | |/|
| | * [Rails5] Add `safe_params` helperblackst0ne2018-04-081-4/+4
* | | Fix dropdownsClement Ho2018-04-171-1/+1
* | | Convert tooltip html: 1 to html: trueClement Ho2018-04-171-1/+1
* | | Fix styles on new merge request compare pageClement Ho2018-04-161-3/+3
* | | Fix bad card renames from scoping issue board card selectorsClement Ho2018-04-161-1/+1
* | | [skip ci] Convert previous .card to .board-cardClement Ho2018-04-131-1/+1
* | | [skip ci] convert label-gray and label-inverse to badge-gray and badge-inverseClement Ho2018-04-131-2/+2
* | | [skip ci] label-info => badge-infoClement Ho2018-04-131-2/+2
* | | [skip ci] Convert .label. to .badge.Clement Ho2018-04-131-4/+4
* | | [skip ci] Replace col-*-offset-* with offset-*-*Clement Ho2018-04-131-1/+1
* | | [skip ci] .form-horizontal => .form-group.rowClement Ho2018-04-123-5/+5
* | | Merge branch 'master' into bootstrap4Clement Ho2018-04-121-1/+1
|\ \ \ | |/ /
| * | Hide `new merge request` button from index pageBob Van Landuyt2018-04-111-1/+1
| * | Rename `create_merge_request` permissionsBob Van Landuyt2018-04-111-1/+1
| |/
* | [skip ci] .control-label to .col-form-labelClement Ho2018-04-111-1/+1
* | [skip ci] Fix bad migrations of -block to -inline-blockClement Ho2018-04-101-8/+8
View Lorry Controller Status