summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* 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 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
|/
* Improved commit message body renderingConstance Okoghenun2018-05-071-2/+2
* Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-022-20/+16
* Resolve "Improve tooltips of collapsed sidebars"Dennis Tang2018-04-191-1/+1
* 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
* | 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
|/
* Set `noteable_type` to use in notesAppKushal Pandya2018-04-061-0/+1
* Issuable list: add tooltips to iconsLukas Eipert2018-03-211-4/+4
* Remove common_vue bundleMike Greiling2018-03-061-3/+0
* Remove mr_notes webpack bundleMike Greiling2018-03-021-5/+0
* Merge branch 'remove-merge-conflicts-bundle' into 'master'Jacob Schatz2018-02-282-4/+0
|\
| * remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-272-4/+0
* | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-281-17/+30
|/
* Converted webpack_bundle_tag to be automatic webpack bundlesPhil Hughes2018-02-261-3/+0
* Rest of Dispatcher RefactorJacob Schatz2018-02-211-1/+0
* Merge branch 'dispatcher-mr-haml' into 'master'Jacob Schatz2018-02-202-4/+0
|\
| * Re-add common_vueClement Ho2018-02-161-0/+2
| * Add dispatcher imports for bundles used in merge request show pathClement Ho2018-02-152-6/+0
* | Chart.html.haml refactorJacob Schatz2018-02-192-4/+4
|/
* Adjust last push notification widthGeorge Tsiolis2018-01-231-1/+2
* Merge branch 'merge-request-target-branch-perf' into 'master'Filipa Lacerda2018-01-171-1/+1
|\
| * actual spec fixesPhil Hughes2018-01-161-0/+1
| * more spec fixesPhil Hughes2018-01-161-1/+0
* | Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-151-1/+5
|/
* Resolve "Modify the empty state of changes in MR"Filipa Lacerda2018-01-031-8/+11
* Replaced the remaining code-fork iconsjivl-general-icons-2Jose Ivan Vargas2017-12-191-1/+1
* Replaced some fork icons instances and fixed the Icon component on the MR WidgetJose Ivan Vargas2017-12-191-1/+1
* Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-181-1/+1
|\
| * Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-1/+1
* | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-131-1/+1
* | Remove unnecessary js-issuable-editremove-unnecessary-js-issuable-editClement Ho2017-12-121-1/+1
* | Add js prefix for issuable-editadd-js-prefix-issuable-editClement Ho2017-12-081-2/+2
|/
* adding view and feature specsmicael.bergeron2017-12-072-5/+5
* add support for the commit reference filtermicael.bergeron2017-12-071-4/+4
* corrects the url buildingmicael.bergeron2017-12-073-20/+18
* diff notes created in merge request on a commit have the right contextmicael.bergeron2017-12-072-5/+5
* Allow commenting on individual commits inside an MRDouwe Maan2017-12-077-32/+48
* Merge branch '32329-empty-state-for-changes-tab-in-mr' into 'master'Clement Ho2017-12-071-1/+9
|\
| * Update empty state page of merge request 'changes' tab32329-empty-state-for-changes-tab-in-mrVitaliy @blackst0ne Klachkov2017-11-301-1/+9
View Lorry Controller Status