diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-06-24 14:19:49 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-06-24 14:19:49 +0000 |
| commit | c465af093096990ee42b3021fce157d02b8864cb (patch) | |
| tree | c7f27ba986702fa47e5c8031a0d8076bf9eb7348 /app/helpers/groups_helper.rb | |
| parent | 7aa8e12c549f1fc8bdc90d1ecfc8535a61f2aacb (diff) | |
| parent | 8b94ca655d2508a6b1885d170d4ad823787b2790 (diff) | |
| download | gitlab-ce-c465af093096990ee42b3021fce157d02b8864cb.tar.gz | |
Merge branch 'master' into 'master'
Updated merge request merged web hook to correctly fire action=merged.
I believe this merge request will fix both issues #879 and #498.
If a merge request was merged via the command line, the correct web hook was fired with the field `object_attributes.action = "merge"`. However, if the merge request was merged via the web UI, the webhook would be fired with `object_attributes.action = "open"`.
See merge request !780
Diffstat (limited to 'app/helpers/groups_helper.rb')
0 files changed, 0 insertions, 0 deletions