summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Starting work on the warn_on_failure feature for the MR build status.Connor Shea2016-07-191-1/+1
* Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+1
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+1
* Don't ask the user to "merge this request manually".Timothy Andrew2016-07-131-1/+1
* Merge branch 'copy-to-clipboard-tooltip' into 'master' Rémy Coutable2016-07-121-3/+3
|\
| * Display tooltip for "Copy to Clipboard" button (!5164)winniehell2016-07-111-3/+3
* | Merge branch 'mr-close-btn' into 'master' Robert Speicher2016-07-111-4/+4
|\ \ | |/ |/|
| * Moved merge request button visibility out of issue_helpermr-close-btnPhil Hughes2016-07-111-4/+4
* | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-081-3/+3
|\ \
| * | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-071-3/+3
| |/
* | Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requestsPaco Guzman2016-07-081-2/+2
* | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-063-7/+7
|/
* Remove unnecessary parenscode_style_fixesValery Sizov2016-06-301-1/+1
* Fixed placement of close button on merge requestsPhil Hughes2016-06-181-2/+2
* Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fixConnor Shea2016-06-171-3/+3
* Merge branch 'merge-request-default-source-branch-text' into 'master' Jacob Schatz2016-06-161-1/+1
|\
| * Added source branch text to dropdown togglePhil Hughes2016-06-161-1/+1
* | Merge branch 'dz-fix-mr-widget-padding' into 'master' Jacob Schatz2016-06-161-1/+1
|\ \
| * | Add bottom padding for merge request command line textdz-fix-mr-widget-paddingDmitriy Zaporozhets2016-06-151-1/+1
* | | Merge branch 'mr-download-dropdown-alignment' into 'master' Jacob Schatz2016-06-161-2/+2
|\ \ \ | |_|/ |/| |
| * | Fixed alignment of download dropdownmr-download-dropdown-alignmentPhil Hughes2016-06-141-2/+2
| |/
* | Merge branch 'commits-ui' into 'master' Jacob Schatz2016-06-151-1/+2
|\ \
| * | Updated commits UIPhil Hughes2016-06-081-1/+2
* | | Fixed issue with MR buttons being in a groupmr-buttons-updatePhil Hughes2016-06-132-40/+23
| |/ |/|
* | Move Labels and Milestones as sub tab to Issues/MRDmitriy Zaporozhets2016-06-102-17/+14
* | Rename ci_commit -> pipelineRémy Coutable2016-06-101-1/+1
* | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-101-1/+1
* | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-1/+1
* | Allow or not merge MR with failed buildRui Anderson2016-06-103-13/+22
* | Merge branch 'merge-conflicts-icon-color' into 'master' Jacob Schatz2016-06-091-2/+2
|\ \
| * | Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-colorFatih Acet2016-06-061-2/+2
* | | Cleanup and imrpove issue/mr buttonsDmitriy Zaporozhets2016-06-083-7/+3
* | | Improve button color for issue and mr pagesDmitriy Zaporozhets2016-06-081-3/+3
| |/ |/|
* | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-063-4/+3
|\ \
| * \ Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-063-4/+3
| |\ \ | | |/
| | * Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-037-5/+15
| | |\
| | * \ Merge branch 'master' into awardablesZJ van de Weg2016-05-308-8/+8
| | |\ \
| | * \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-254-6/+10
| | |\ \ \
| | * | | | Fix latests concernsZJ van de Weg2016-05-182-4/+3
| | * | | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-10/+4
| | * | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1110-55/+55
| | |\ \ \ \
| | * | | | | Create table for award emojiZeger-Jan van de Weg2016-05-062-3/+3
* | | | | | | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-035-9/+9
|/ / / / / /
* | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-034-1/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-034-1/+11
| |\ \ \ \ \
| | * | | | | fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-apiSean McGivern2016-06-021-2/+2
| | * | | | | Don't allow merges with new commitsSean McGivern2016-06-014-1/+11
* | | | | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-032-3/+3
|/ / / / / /
* | | | | | Merge branch 'fix-dropdown-cutoff' into 'master' Robert Speicher2016-06-021-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add a title attribute to each branch in the branches dropdown on the New MR p...Connor Shea2016-05-311-1/+1
| | |_|_|/ | |/| | |
View Lorry Controller Status