[WIP/RFC] integration branch review #440
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Account foreign key
replace the fields
sync_invoice_from_stripe_data: use stripe_account
Enhance admin with connect search
Remove UserAccount.account
Bring back UserAccount.account
Our fork doesn't need templates
remove also customes in migraiton for consistency
Conflicts: .circleci/config.yml tox.ini
Merge upstream
Conflicts: pinax/stripe/migrations/0011_rename_account_transfers_payout.py pinax/stripe/migrations/0013_charge_outcome.py pinax/stripe/tests/test_webhooks.py pinax/stripe/webhooks.py
This also fixes some event fixtures. Fixes pinax#467.
Merge master
link_customer: create missing customers
This removes he following from
0010_connect_squashed_0026_merge_20171106_2259's `replaces`:
('pinax_stripe', '0025_remove_subscription_stripe_account'),
('pinax_stripe', '0016_auto_20171106_1234'),
('pinax_stripe', '0014_auto_20171026_1304'),
('pinax_stripe', '0017_merge_20171106_2201'),
('pinax_stripe', '0026_merge_20171106_2259'),
It was necessary for me to get the
0010_connect_squashed_0026_merge_20171106_2259 migration to be
recognized when in the following state (`manage.py showmigrations`):
[X] 0010_connect
[X] 0011_rename_account_transfers_payout
[X] 0011_auto_20171121_1648
[X] 0012_merge_20171121_1652
[X] 0013_charge_outcome
[ ] 0014_blank_with_null
[ ] 0015_blank_account_legal_entity_dob
Conflicts: .circleci/config.yml pinax/stripe/admin.py
Merge master into next
Merge upstream
Support stripe-python 2.0
Conflicts: pinax/stripe/actions/coupons.py pinax/stripe/tests/test_actions.py
Merge master
This is required with users through connected accounts.
user_search_fields: include users
"root" is not available anymore?! Ref: https://circleci.com/gh/lock8/pinax-stripe/1256
Fix ChargeWebhook for charge.dispute events
increased stripe_publishable_key data length for new stripe api keys
paltman
added
the
Original
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is just for review / comments - a comparison to our "next" branch, where we merge things already that are useful to us, and which might also contain things not being submitted already.
This is not meant to be merged as-is, but rather to become empty.