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-08-01webhooks: include old revision in MR update eventsBen Boeckel
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-13Move all "checks" under `GitLab::Checks`.Timothy Andrew
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4892#note_12892160 - This is more consistent.
2016-07-08Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon
2016-07-07Automatically update diff note positions when MR is pushed toDouwe Maan
2016-07-07Rename MergeRequest methods that return commits or shas to be more clear and ↵Douwe Maan
consistent
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.
2015-12-15Fixed Rubocop offensesGabriel Mazetto
2015-11-18Merge branch 'master' into merge-if-greenZeger-Jan van de Weg
2015-11-18API support, incorporated feedbackZeger-Jan van de Weg
2015-11-06Fix bug where manually merged branches in a MR would end up with an empty diffStan Hu
Closes #3314
2015-11-02Merge when build succeedsZeger-Jan van de Weg
2015-10-21Clean up MR refresh service somewhat.Douwe Maan
2015-10-21Make sure MR refresh service correctly determines newly added commits.Douwe Maan
2015-10-16Add spec for refresh service adding notes to restored branchesStan Hu
2015-10-16Rubocop fixStan Hu
2015-10-16Add system notes for restored branchesStan Hu
2015-10-16Memoize merge request source branchesStan Hu
2015-10-16Improve SystemNote interface for branch add/restore caseStan Hu
2015-10-16Preserve target branchStan 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-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16Fix refresh serviceDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16Huge refactoring for accepting merge requestsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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-05-11Update SystemNoteService method naming conventionsRobert Speicher
Now the verb comes first, and there is no restriction on singular/plural.
2015-05-11Add a SystemNoteService classRobert Speicher
There's a lot of code in the Note model that only deals with creating system notes, so we're going to split that into its own class.
2015-03-23Don't mark merge request as updated when merge status relative to target ↵Douwe Maan
branch changes.
2015-03-18Fix condensed range in MR push comment.Douwe Maan
2015-03-10Use Gitlab::Git helper methods and constants as much as possible.Douwe Maan
2015-03-06Condense commits already in target branch when updating merge request source ↵Douwe Maan
branch.
2015-02-24Merge pull request #8180 from Bugagazavr/mr_updateDmitriy Zaporozhets
Trigger merge request hook when source updated
2015-01-07Refactor merge request merge serviceDmitriy Zaporozhets
* Add system note when user merges MR in same way as it closes it * Remove duplicating code
2014-12-09Trigger merge request hook when source updatedKirill Zaitsev
2014-12-02Reload mr code on force push tooDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02Improve MR code reloading when push codeDmitriy Zaporozhets
Every time you pushed to master it updates merge requests that has master as target branch. So if you have 50 open merge requests point to master it will reload all of them every time you push a single commit to master. The funny thing is that after reloading diff of most merge requests looks the same. After this patch we update diff only if we push commit to master that includes in MR commits list. For example we have next repository: feature: A - B - C master: A We create merge requests #1 with code from feature to master. MR #1: B - C If we push to master commit D - MR will not be reloaded. So picture will look next: feature: A - B - C master: A - D MR #1: B - C And if we push to master commit B - MR will be reloaded. So picture will look next: feature: A - B - C master: A - B MR #1: C Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11Refactor merge request refresh logic on pushDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>