summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* HAMLLint: Fix `TrailingWhitespace` offencesKushal Pandya2016-12-315-6/+4
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-312-2/+2
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-311-1/+1
* Merge branch '25996-Move-award-emoji-out-of-the-discussion-tab-for-MR' into '...Fatih Acet2016-12-291-3/+3
|\
| * Move award emoji's out of the discussion tab for merge requestsdimitrieh2016-12-281-3/+3
* | CTRL+Enter does not submit a new merge requestSaad Shahd2016-12-291-1/+1
|/
* Replace link to Resolve conflicts with buttons21135-resolve-these-conflicts-link-is-too-subtleSam Rose2016-12-281-14/+16
* Fix grammar error in text about mentioned issuesGrzegorz Bizon2016-12-281-1/+1
* Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-214-20/+1
|\
| * Remove builds tab from commitFilipa Lacerda2016-12-211-1/+0
| * Removes builds tab from merge requestFilipa Lacerda2016-12-213-19/+1
* | Merge branch 'backport-mr-widget-ci-js' into 'master' Alfredo Sumaran2016-12-212-24/+6
|\ \
| * | Move javascript for widget check to ci_bundle.Bryce Johnson2016-12-211-6/+3
| * | Backport moving MR widget CI JS out of script tag.Bryce Johnson2016-12-211-18/+3
| |/
* | Adds CSS class to status icon on MR widget to prevent non-colored iconFilipa Lacerda2016-12-211-1/+1
|/
* Set “Remove branch” button to default sizeAlfredo Sumaran2016-12-211-1/+1
* remove button class size alteration from revert and cherry pick linksMike Greiling2016-12-211-2/+2
* Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-172-6/+15
|\
| * Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-161-5/+3
| * better text for mentioned but not closedGabriel Gizotti2016-12-161-1/+1
| * add mentioned but not closed message to the same line as closes issueswqGabriel Gizotti2016-12-161-13/+14
| * backend completely drives creation of merge commit messageGabriel Gizotti2016-12-162-3/+3
| * Add toggle links for using default message and description on change merge co...Gabriel Gizotti2016-12-161-0/+1
| * better mentioned but not closing message and iconGabriel Gizotti2016-12-161-2/+2
| * diplays mentioned but not merged message on MR show pageGabriel Gizotti2016-12-161-0/+9
* | Merge branch '20916-issues-mrs-linelength' into 'master' Annabel Dunstone Gray2016-12-161-1/+2
|\ \ | |/ |/|
| * Limit description container for mrs while viewing side by side diff20916-issues-mrs-linelengthtauriedavis2016-12-151-1/+1
| * Add content_class for limited widthAnnabel Dunstone Gray2016-12-091-0/+1
* | Merge branch '24877-bulk-edit-only-keeps-common-labels-when-searching' into '...Fatih Acet2016-12-151-1/+1
|\ \
| * | Improve issuable's bulk assignment implementationAlfredo Sumaran2016-12-141-1/+1
| |/
* | Merge branch 'remove-unnecessary-message-mr-commits-tab' into 'master' Fatih Acet2016-12-151-4/+0
|\ \
| * | Remove unnecessary messageVictor Wu2016-12-091-4/+0
| |/
* | Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-152-2/+2
|/
* add link_to_if helper on target_branch link on Merge Request show page for ca...Rydkin Maxim2016-12-081-1/+1
* Merge branch '23589-open-issue-for-mr' into 'master' Sean McGivern2016-12-061-1/+5
|\
| * Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-051-1/+5
* | Merge branch 'refine-ci-statuses' into 'master' Kamil Trzciński2016-12-061-2/+1
|\ \ | |/ |/|
| * Remove unsued variable from merge request widgetGrzegorz Bizon2016-12-061-2/+1
* | Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-052-3/+3
|\ \ | |/ |/|
| * Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-305-9/+12
| |\
| * \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-253-8/+5
| |\ \
| * | | Rename MWPS in user interface and feature testsGrzegorz Bizon2016-11-211-2/+2
| * | | Rename MWPS in system notes and related testsGrzegorz Bizon2016-11-211-1/+1
* | | | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-012-2/+2
| |_|/ |/| |
* | | Merge branch 'fix/rename-merge-request-head-pipeline' into 'master' Kamil Trzciński2016-11-302-3/+3
|\ \ \
| * | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-292-3/+3
* | | | Fix pipelines info being hidden in merge request widget25055-pipelines-info-missing-from-mr-widgetAdam Niedzielski2016-11-291-1/+1
|/ / /
* | | Prevent error when submitting a merge request and pipeline is not defined24860-actionview-template-error-undefined-method-size-for-nil-nilclassAdam Niedzielski2016-11-282-5/+8
| |/ |/|
* | Merge branch '24266-afraid-to-press-the-orange-button-on-merge-request-screen...Fatih Acet2016-11-221-1/+1
|\ \
| * | If Build running change accept merge request when build succeeds button from ...Dimitrie Hoekstra2016-11-181-1/+1
| |/
View Lorry Controller Status