[#753] - Catch when pull requests are merged and set state accordingly
- Fixed in Code Base
- 12 Mar 2016
- Medium
- Build: master
- # 753
- Diff
- joomla:merged-status
- Success continuous-integration/travis-ci/push The Travis CI build passed Details
- Success continuous-integration/travis-ci/pr The Travis CI build passed Details
User tests: Successful: Unsuccessful:
Summary of Changes
Pull request webhooks are setting some merge state data which we can use to track statuses better in the application. This PR will check if a pull request gets closed and is merged (looks like it applies to the big green button only, I need to find something merged manually) and if so we'll set the closed status to "Fixed in Code Base" instead of the generic "Closed". We'll also add a merge activity for the person who merged the item (though it looks like this happens already but I can't trace down what's adding it).
Testing Instructions
Review changes and compare them against the pull request webhook data (https://github.com/joomla/jissues/settings/hooks/1060432 has a log of them for repo admins). Throw this patch on a server that can receive hooks, close a PR on a project the app supports, and validate the state and activity data is updated accordingly.
That's what's happening now. Actually, there are a bunch of activities happening on a merge it looks like, this comes from #751... http://cl.ly/0u140k2R1C3E
| Status | New | ⇒ | Closed |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2016-03-12 17:44:37 |
| Closed_By | ⇒ | b2z |
Actually, also the two activities are different. Close will always be when an item gets closed (issue, PR, merged or not) but the merge activity should only be when someone merges a PR. So ya, that's right in the sense of what each activity is.
| Status | Closed | ⇒ | Fixed in Code Base |
Is it ok to have two activities here: close and merge?