Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

"Ready to verify" #4584

Merged
merged 2 commits into from
Sep 28, 2017
Merged

"Ready to verify" #4584

merged 2 commits into from
Sep 28, 2017

Conversation

chadwhitacre
Copy link
Contributor

@chadwhitacre chadwhitacre commented Aug 24, 2017

← Limit pending verifications (#4579) — Support queueing w/o participants (#4548) →


Implement the "Ready to verify" idea from #4557 (comment).

Todo

@chadwhitacre chadwhitacre changed the base branch from master to limit-verifications-in-ui August 24, 2017 21:31
@chadwhitacre chadwhitacre force-pushed the limit-verifications-in-ui branch from 3b6b14e to a7eef81 Compare August 24, 2017 21:32
@chadwhitacre
Copy link
Contributor Author

ae7ca59:

gsjd9eblpj

@chadwhitacre chadwhitacre force-pushed the ready-to-verify branch 2 times, most recently from 36fefaa to c16a2f9 Compare August 28, 2017 13:30
@chadwhitacre
Copy link
Contributor Author

@rohitpaulk Putting this in review, punting the rest to #4520. With this we are minimally protected against phishing ... enough for now, methinks.

@chadwhitacre
Copy link
Contributor Author

Rebased, was eb6b4a8.

@chadwhitacre chadwhitacre force-pushed the ready-to-verify branch 3 times, most recently from 84945c1 to fa6d28f Compare September 1, 2017 15:51
@chadwhitacre chadwhitacre force-pushed the limit-verifications-in-ui branch 2 times, most recently from dfa177e to a6b4315 Compare September 1, 2017 19:18
@chadwhitacre chadwhitacre force-pushed the limit-verifications-in-ui branch from a6b4315 to dd375b8 Compare September 8, 2017 13:48
@rohitpaulk rohitpaulk force-pushed the limit-verifications-in-ui branch from dd375b8 to c3452ab Compare September 8, 2017 14:37
@rohitpaulk
Copy link
Contributor

Rebased

@rohitpaulk rohitpaulk force-pushed the limit-verifications-in-ui branch from c3452ab to 8eb5d0e Compare September 16, 2017 14:14
@chadwhitacre chadwhitacre changed the base branch from limit-verifications-in-ui to master September 18, 2017 16:35
@chadwhitacre
Copy link
Contributor Author

Rebased now that #4579 is in.

@chadwhitacre
Copy link
Contributor Author

Erm, I lied. Conflicts!

@mattbk
Copy link
Contributor

mattbk commented Sep 22, 2017

I didn't fix the conflicts yet, but the current version works on my end. If someone gets around to fixing the conflicts before I do, I can merge.

@mattbk
Copy link
Contributor

mattbk commented Sep 27, 2017

Oops, I was being too inclusive there.

gratipay/testing/browser.py:17: redefinition of unused 'StaleElementReferenceException' from line 10
gratipay/testing/browser.py:18: redefinition of unused 'WebDriverWait' from line 14
gratipay/testing/browser.py:19: redefinition of unused 'staleness_of' from line 13

@mattbk
Copy link
Contributor

mattbk commented Sep 27, 2017

Still checks out for me. Updating.

@mattbk
Copy link
Contributor

mattbk commented Sep 27, 2017

Someone else can merge since I fixed the conflicts.

@chadwhitacre
Copy link
Contributor Author

I'm trying to rebase on master and getting a weird result:

The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git reset'
rebase in progress; onto 5fbc18e
You are currently rebasing branch 'ready-to-verify' on '5fbc18e'.

nothing to commit, working directory clean
Could not apply afceb538d9dad5e5efaada1b8b185ed5e6d71969... Fix indentation

Possibly because some of these commits were already merged under #4579?

@chadwhitacre
Copy link
Contributor Author

Yup, looks like it. 👍

If unverified, allow to use the package page to start verification.
@chadwhitacre
Copy link
Contributor Author

Rebased! Was 8d1bfbe. I believe it's back to you for the merge, @mattbk? :-)

@mattbk mattbk merged commit 73b162e into master Sep 28, 2017
@mattbk mattbk deleted the ready-to-verify branch September 28, 2017 16:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants