summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Active tense test coveragejej-backport-active-tense-specsValery Sizov2017-02-011-1/+1
* Backport EE changes on approvals reset for closed MRsbackport-ee-1051-approvals-reset-on-closed-mrOswaldo Ferreira2017-01-231-14/+37
* Mark MR as WIP when pushing WIP commitsjurre2017-01-191-0/+64
* Address MR commentsJarka Kadlecova2017-01-131-1/+1
* support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-0/+93
* Merge branch 'issue_22664' into 'master' Sean McGivern2016-12-291-0/+2
|\
| * Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-271-0/+2
* | Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-fileSean McGivern2016-12-261-0/+1
|/
* Ensure issuable state changes only fire webhooks onceMark Fletcher2016-12-161-0/+5
* Do not reload diff for merge request made from fork when target branch in for...do-not-refresh-main-when-fork-target-branch-updatedAdam Niedzielski2016-12-091-9/+19
* Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-051-5/+11
|\
| * Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-304-9/+38
| |\
| * \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-257-40/+69
| |\ \
| * | | Rename MWPS in system notes and related testsGrzegorz Bizon2016-11-211-1/+1
| * | | Rename MWBS service to Merge When Pipeline SucceedsGrzegorz Bizon2016-11-211-4/+10
* | | | Merge branch 'rs-include-emailhelpers' into 'master' Rémy Coutable2016-12-011-0/+2
|\ \ \ \
| * | | | Only include EmailHelpers in mailer specs and specs using themrs-include-emailhelpersRobert Speicher2016-12-011-0/+2
| | |_|/ | |/| |
* | | | Refactor JiraService by moving code out of JiraService#execute methodclean-up-jira-serviceAdam Niedzielski2016-12-011-1/+1
|/ / /
* | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-292-9/+25
* | | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan2016-11-281-0/+12
* | | Merge branch 'timeout-merge-request-for-binary-file' into 'master' Yorick Peterse2016-11-251-0/+1
|\ \ \ | |_|/ |/| |
| * | Fix: Timeout creating and viewing merge request for binary filetimeout-merge-request-for-binary-fileValery Sizov2016-11-251-0/+1
* | | Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-246-25/+25
|/ /
* | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-211-10/+0
|\ \
| * | Revert "Do not create a MergeRequestDiff record when source branch is deleted"Adam Niedzielski2016-11-211-10/+0
* | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-211-5/+28
|\ \ \ | |/ / |/| |
| * | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-211-5/+28
| |/
* | Merge branch 'issue_5541' into 'master' Sean McGivern2016-11-211-0/+16
|\ \ | |/ |/|
| * Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-181-0/+16
* | Merge branch 'fix-tests-for-different-host' into 'master' Rémy Coutable2016-11-181-3/+3
|\ \ | |/ |/|
| * Use `Gitlab.config.gitlab.host` over `'localhost'`fix-tests-for-different-hostLin Jen-Shin2016-11-181-3/+3
* | Merge branch 'issue_13232' into 'master' Sean McGivern2016-11-181-2/+4
|\ \ | |/ |/|
| * Add JIRA remotelinks and prevent duplicated closing messagesFelipe Artur2016-11-181-2/+4
* | Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-171-1/+1
* | Do not create a MergeRequestDiff record when source branch is deletedfix-merge-request-screen-deleted-source-branchAdam Niedzielski2016-11-161-0/+10
|/
* Add validation errors to Merge Request formAlex Sanford2016-11-011-0/+49
* Fix optimistic lockingKamil Trzcinski2016-10-261-0/+2
* Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issuesAdam Niedzielski2016-10-201-0/+12
* Prevent wrong markdown on issue ids when project has Jira service activatedissue_828Felipe Artur2016-10-191-0/+12
* Improve error logging of MergeServiceStan Hu2016-10-181-2/+2
* Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-1/+2
|\
| * Merge branch '15463-extract-update-merge-requests' into 'master' Yorick Peterse2016-10-141-1/+2
| |\
| | * Extract project#update_merge_requests and SystemHooks to its own worker from ...15463-extract-update-merge-requestsPaco Guzman2016-10-131-1/+2
* | | Fix resolve service specsSean McGivern2016-10-131-2/+2
* | | Allow setting content for resolutionsSean McGivern2016-10-131-9/+130
|/ /
* | Merge branch '23234-deleting-a-milestone-removes-source-branch-deletion-optio...Rémy Coutable2016-10-131-0/+12
|\ \ | |/ |/|
| * Maintain "force_remove_source_branch" options on Merge Request unless specifiedMark Fletcher2016-10-131-0/+12
* | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-121-2/+2
|\ \ | |/
| * Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan2016-10-121-2/+2
| |\
| | * refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-mergedtiagonbotelho2016-10-111-2/+2