Merge pull request #81 from Yelp/release-candidate

Release 0.3.2

 PERFORMANCE TWEAKS

 * Only requeue existing conflicted pickme's when a pickme
   is removed. (rschlaikjer, #79, #80)
Run SHA fetching and conflict checking separately

SHAs were getting set very slowly since they could be stuck behind conflict
checking jobs in the GitQueue. This caused problems where two verify jobs
could end up both running after an edit, which would raise a GitError, as
well as the issue of external resources reliant on pickme SHA not being usable.

This patch breaks the GitQueue into two queues with two workers; one for SHA
fetching, that queries the remote, and one for conflict checking, which uses
the local git repo.
A pickme cannot be it's own duplicate

Don't throw a duplicate SHA error if you are comparing the pickme
to itself.
Differentiate re-running all pickmes and all conflicting pickmes for push
Add button and servlet to re-check push for conflicts
Merge pull request #83 from rschlaikjer/make-verify-realtime

Separate git sha retrieval from git merge conflict detection.

Use separate worker queues to run branch verification and git merge conflict detection. Git merge conflict detection takes more time and should not be blocking branch verification.
Check if pickmes are already merged into master, and if so ignore them
Merge pull request #91 from rschlaikjer/check-if-pickme-in-master

Don't run merge-detection on already merged pickmes.

Sometimes merge-detection can be triggered on pickmes that have been included in master already. The result will always be conflict-master in that case.
Fetch non-ff changes
Merge pull request #90 from rschlaikjer/pull-rebased-repos

Fetch non-ff changes

Explicit fetching triggers non-ff detection. + fixes that. refs/heads is also needed because fetch doesn't resolve the remote branchname properly.
Merge pull request #92 from rschlaikjer/add-rerun-detection-button

Add rerun detection button

Allow pushmasters to manually trigger merge-detection. Useful when a previous push has certed.
Release 0.3.3

 BUG FIXES

 * Don't run merge detection on merged requests (rschlaikjer, #84, #91)
 * Fetch non-ff branches (rschlaikjer, #85, #90)

 IMPROVEMENTS

 * Manually rerun merge detection (rschlaikjer, #86, #92)

 PERFORMANCE TWEAKS

 * Separate git sha retrieval from git merge conflict detection.
   (rschlaikjer, #82, #83)
Merge pull request #93 from Yelp/release-candidate

Release 0.3.3

 BUG FIXES

 * Don't run merge detection on merged requests (rschlaikjer, #84, #91)
 * Fetch non-ff branches (rschlaikjer, #85, #90)

 IMPROVEMENTS

 * Manually rerun merge detection (rschlaikjer, #86, #92)

 PERFORMANCE TWEAKS

 * Separate git sha retrieval from git merge conflict detection.
   (rschlaikjer, #82, #83)
Remove extra logline
Handle 'no such commit' merge-base error

If a commit is entirely unknown to git, it will error.
Treat this as the commit not being in master.
Get the SHA of the secondary pickme, not primary

We needed to verify whether the current pickme we are comparing our base pickme
against exists in master, but were just checking if the base pickme is in master
Merge pull request #94 from rschlaikjer/fix-incorrect-req-reference

Handle 'no such commit' merge-base error, incorrect request reference, overly verbose logline