40a9b1ce00
Fix bug where manually merged branches in a MR would end up with an empty diff
...
Closes #3314
2015-11-05 23:47:04 -08:00
464c939a7e
Clean up MR refresh service somewhat.
2015-10-21 17:34:12 +02:00
9c61b73c21
Make sure MR refresh service correctly determines newly added commits.
2015-10-21 17:24:09 +02:00
888c1a3fc5
Add spec for refresh service adding notes to restored branches
2015-10-16 00:33:58 -07:00
bf290a52b7
Rubocop fix
2015-10-15 23:54:13 -07:00
577565d939
Add system notes for restored branches
2015-10-15 23:54:13 -07:00
9c67f4fb51
Memoize merge request source branches
2015-10-15 23:54:13 -07:00
effa94bb87
Improve SystemNote interface for branch add/restore case
2015-10-15 23:54:13 -07:00
22775c596f
Preserve target branch
2015-10-15 23:54:13 -07:00
2611d9f63c
Add a system note and update relevant merge requests when a branch is 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-10-15 23:54:13 -07:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
989329c9d9
Fix refresh service
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:34:58 +02:00
a7fded9b95
Huge refactoring for accepting merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:03:07 +02:00
a927bf56b1
Call merge request web hook for each commits
...
Call merge request web hook every times a new commit hits the
source branch
Signed-off-by: Arthur Gautier <baloo@gandi.net>
2015-05-13 09:33:20 +02:00
686f6855c2
Update SystemNoteService method naming conventions
...
Now the verb comes first, and there is no restriction on
singular/plural.
2015-05-11 00:01:15 -04:00
48e6fb532a
Add a SystemNoteService class
...
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-05-11 00:01:01 -04:00
70fa9d5629
Don't mark merge request as updated when merge status relative to target branch changes.
2015-03-23 17:30:19 +01:00
ebfc7d052b
Fix condensed range in MR push comment.
2015-03-18 16:37:29 +01:00
383c56efa1
Use Gitlab::Git helper methods and constants as much as possible.
2015-03-10 13:39:31 +01:00
663b3c968f
Condense commits already in target branch when updating merge request source branch.
2015-03-06 18:09:00 +01:00
8461c4b4d3
Merge pull request #8180 from Bugagazavr/mr_update
...
Trigger merge request hook when source updated
2015-02-23 23:48:46 -08:00
ccdf08d80a
Refactor merge request merge service
...
* Add system note when user merges MR in same way as it closes it
* Remove duplicating code
2015-01-06 16:24:47 -08:00
de7c3291e9
Trigger merge request hook when source updated
2014-12-09 23:44:13 +03:00
835cbc06d8
Reload mr code on force push too
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 17:42:56 +02:00
9211b541d3
Improve MR code reloading when push code
...
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-12-02 16:22:23 +02:00
2139e3519b
Refactor merge request refresh logic on push
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11 16:49:26 +02:00
Stan Hu