Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-18Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-13Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
2016-07-13Enforce "developers can merge" during `pre-receive`.Timothy Andrew
1. When a merge request is being merged, save the merge commit SHA in the `in_progress_merge_commit_sha` database column. 2. The `pre-receive` hook looks for any locked (in progress) merge request with `in_progress_merge_commit_sha` matching the `newrev` it is passed. 3. If it finds a matching MR, the merge is legitimate. 4. Update `git_access_spec` to test the behaviour we added here. Also refactored this spec a bit to make it easier to add more contexts / conditions.
2016-07-12Avoid `describe`-ing symbols in specsRobert Speicher
2016-07-01Enable Style/EmptyLines cop, remove redundant onesGrzegorz Bizon
2016-05-17Create a todo on failing MR buildSean McGivern
When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit.
2016-03-03Use Gitlab::Git::DiffCollectionsJacob Vosmaer
2015-12-09Merge branch 'master' into split-up-buildsDouwe Maan
2015-12-09Tag service specsDouwe Maan
2015-12-05Incorporate feedbackZeger-Jan van de Weg
2015-12-02Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg
2015-11-06Add spec for manual merge of merge requestStan Hu
2015-10-16Reorder system note verb to say "Restored source branch X" instead of ↵Stan Hu
"Source branch X restored"
2015-10-16Add spec for refresh service adding notes to restored branchesStan Hu
2015-10-16Improve SystemNote interface for branch add/restore caseStan Hu
2015-10-16Add a system note and update relevant merge requests when a branch is ↵Stan Hu
deleted or re-added If a branch is deleted with an open merge request, amended offline, and then pushed again, GitLab doesn't bother to update the merge request even though the last commit ID and/or code may have changed. This MR ensures that each push will update any relevant merge requests and adds a system note if this happens as well. Closes #2926
2015-06-23Fix Style/AlignHash cop violationsStan Hu
2015-05-13Call merge request web hook for each commitsArthur Gautier
Call merge request web hook every times a new commit hits the source branch Signed-off-by: Arthur Gautier <baloo@gandi.net>
2015-03-06Condense commits already in target branch when updating merge request source ↵Douwe Maan
branch.
2015-02-12Updated rspec to rspec 3.x syntaxJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-01-07Improve mr refresh service testsDmitriy Zaporozhets
2014-11-11Refactor merge request refresh logic on pushDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>