Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 241
    • Issues 241
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 31
    • Merge Requests 31
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !254

Merged
Opened 1 month ago by Mark Harding@markeharding
  • Report abuse
Report abuse

&37 - Multi-currency

Depends on front!508

Edited 2 days ago by Mark Harding
Request to merge epic/37-wire into master
  • Email patches
  • Plain diff
Pipeline #79211001 passed for a6d209df on epic/37-wire
          Merge request approved. Approved by
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          Rami Albatal
          Rami Albatal
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera
          Ben Hayward
          Ben Hayward

          Merged by Mark Harding 7 minutes ago

          The changes were merged into master with 48536207

          The source branch has been deleted

          Closed #794 (closed)

          Pipeline #79224168 running for 48536207 on master
                      • Discussion 36
                      • Commits 17
                      • Pipelines 28
                      • Changes 72
                      33/33 threads resolved
                      • Loading...
                      • Mark Harding @markeharding added MR::Requires Changes scoped label 1 month ago

                        added MR::Requires Changes scoped label

                      • Mark Harding @markeharding added 1 commit 1 month ago

                        added 1 commit

                        • 6247063d - (chore): increase upload limit

                        Compare with previous version

                      • Mark Harding @markeharding added 24 commits 1 month ago

                        added 24 commits

                        • 31775e64 - (refactor): support hydrating the first batch of entities
                        • c490a207 - (chore): increase price to 1.25
                        • b8e8318e - (fix): onchain wire notifications now trigger
                        • fec067c2 - (feat): Retry queue for ElasticSearch
                        • 61b2956a - (feat): feed fixes including pinned posts for containers
                        • 4a65cc9f - (fix): failing spec tests
                        • 8f6ba21b - (fix): if no hydrated entities don't return entities
                        • 48d61f9d - (chore) crushing cockroach and cleaning up installer
                        • ac2d0e9f - Feat/email schema 187
                        • e4218a4e - (feat): whitehouse email template
                        • 1b6f465d - (feat): Client uploader
                        • fbc655fb - sprint/InterestingIguana: Blocked users can no longer send you a wire transactions #608 (closed)
                        • 0f3c1f46 - (chore): If mobile app then return generic urn
                        • 1c7c67cb - (fix): if faux activities then cast as such
                        • 12928e86 - (fix): reverse pinned posts array
                        • d1c86abe - (feat): transcoder now only listens for single message
                        • 6819a904 - (fix): 500 error on firehose
                        • 0e8b04fb - (fix): map to the entity
                        • 7c9aeeb4 - (fix): failing tests for firehose
                        • 941e6f9e - InterestingIguana Fixed blog edits not saving #593 (closed)
                        • 9026f4d1 - Resolve "(bug): publishing a blog that was saved as a draft or "unlisted" does...
                        • 0b951a37 - (fix): ensure arrays are sent to tags and not objects
                        • df35a293 - (fix): decode search query
                        • bf4cb175 - Sprint/InterestingIguana Add GitLab to settings example

                        Compare with previous version

                        Toggle commit list
                      • Mark Harding @markeharding added 1 commit 1 month ago

                        added 1 commit

                        • de39c72f - (refactor): Add new Stripe Managers and refactor Wire to be abstracted from Paywall

                        Compare with previous version

                      • Mark Harding @markeharding added 4 commits 1 month ago

                        added 4 commits

                        • 2ba461cf - (fix): export account not merchant
                        • 959d2470 - (fix): set API key for stripe OO instances
                        • 1c39ee43 - (fix): minor patches to stripe connect module
                        • d4433729 - (fix): pass arguments not array

                        Compare with previous version

                        Toggle commit list
                      • Mark Harding @markeharding added Squad::Blue scoped label 1 month ago

                        added Squad::Blue scoped label

                      • Mark Harding @markeharding added 1 commit 1 month ago

                        added 1 commit

                        • c2099aa6 - (feat): working stripe with wire

                        Compare with previous version

                      • Mark Harding @markeharding added 70 commits 1 month ago

                        added 70 commits

                        • c2099aa6...0abf1410 - 68 commits from branch master
                        • 5d80ca91 - (chore): bump stripe version
                        • a852d273 - Merge branch 'master' of gitlab.com:minds/engine into epic/37-wire

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 1 month ago

                        added 1 commit

                        • 78cfd1bc - (wip): Stripe wire changes

                        Compare with previous version

                      • Olivia Madrid @omadrid marked the task ERC-20's as completed 1 month ago

                        marked the task ERC-20's as completed

                      • Olivia Madrid @omadrid marked the task ERC-20's as incomplete 1 month ago

                        marked the task ERC-20's as incomplete

                      • Mark Harding @markeharding added 2 commits 1 week ago

                        added 2 commits

                        • aaa7ba14 - (feat): wire emails support multiple currencies
                        • 5b753d1c - (feat): btc support

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 1 week ago

                        added 1 commit

                        • 9658b9c8 - (chore): bump up composer

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 1 week ago

                        added 1 commit

                        • 4ef022e1 - (fix): resolve backend tests for new wire features

                        Compare with previous version

                      • Mark Harding @markeharding mentioned in merge request front!508 1 week ago

                        mentioned in merge request front!508

                      • Mark Harding @markeharding changed the description 1 week ago

                        changed the description

                      • Mark Harding @markeharding added 76 commits 6 days ago

                        added 76 commits

                        • 4ef022e1...c1dac85a - 75 commits from branch master
                        • 5b1950ec - Merge branch 'master' of gitlab.com:minds/engine into epic/37-wire-redux

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 6 days ago

                        added 1 commit

                        • e091b442 - Merge branch 'master' of gitlab.com:minds/engine into epic/37-wire-redux

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 2 days ago

                        added 1 commit

                        • 31fdb7fc - (fix): email issues with wire, and other patches

                        Compare with previous version

                      • Mark Harding @markeharding added 9 commits 2 days ago

                        added 9 commits

                        • 31fdb7fc...8e6942b6 - 6 commits from branch master
                        • 710463c4 - (chore): lint project before merge with master
                        • ff29e70c - Merge branch 'master' of gitlab.com:minds/engine into epic/37-wire
                        • f1f6cc1c - (fix): failing tests

                        Compare with previous version

                        Toggle commit list
                      • Mark Harding @markeharding unmarked as a Work In Progress 2 days ago

                        unmarked as a Work In Progress

                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 days ago
                        Resolved by Mark Harding 23 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 days ago
                        Resolved by Mark Harding 1 day ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Brian Hatchet
                        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 days ago
                        Resolved by Mark Harding 22 hours ago
                      • Mark Harding @markeharding added 1 commit 1 day ago

                        added 1 commit

                        • 33f55e71 - (fix): do not do a strict check in array

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 22 hours ago

                        added 1 commit

                        • 3477acfb - (fix): code review fixes

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 22 hours ago

                        added 1 commit

                        • 2a5d64fe - (fix): code review fixes

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 22 hours ago

                        added 1 commit

                        • 845ded43 - (fix): code review fixes

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 22 hours ago

                        added 1 commit

                        • a84c3b6f - (fix): code review fixes

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 22 hours ago

                        added 1 commit

                        • 02d3e34a - (fix): code review fixes

                        Compare with previous version

                      • Mark Harding @markeharding resolved all threads 22 hours ago

                        resolved all threads

                      • Mark Harding @markeharding added 1 commit 22 hours ago

                        added 1 commit

                        • ef32fe35 - (fix): code review fixes

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 21 hours ago

                        added 1 commit

                        • 3d2d0f8a - (fix): code review fixes

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 21 hours ago

                        added 1 commit

                        • 9d0ccbda - (fix): code review fixes

                        Compare with previous version

                      • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 21 hours ago

                        approved this merge request

                      • Mark Harding @markeharding added 1 commit 1 hour ago

                        added 1 commit

                        • 5db39b49 - (fix): catch and rethrow stripe errors - closes #794 (closed)

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 1 hour ago

                        added 1 commit

                        • 99f79b7d - (fix): catch error when adding payment method

                        Compare with previous version

                      • Mark Harding @markeharding added 2 commits 1 hour ago

                        added 2 commits

                        • f3a06d68 - (fix): adding payment method fails because of incorrect customer lookup
                        • 119c6d9a - (fix): if no customer, return empty list

                        Compare with previous version

                      • Mark Harding @markeharding added 1 commit 1 hour ago

                        added 1 commit

                        • a6d209df - (fix): cs styling

                        Compare with previous version

                      • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 11 minutes ago

                        approved this merge request

                      • Mark Harding @markeharding merged 7 minutes ago

                        merged

                      • Mark Harding @markeharding mentioned in commit 48536207 7 minutes ago

                        mentioned in commit 48536207

                      • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
                      Please register or sign in to reply
                      0 Assignees
                      None
                      Assign to
                      None
                      Milestone
                      None
                      Assign milestone
                      None
                      Time tracking
                      No estimate or time spent
                      2
                      Labels
                      MR::Requires Changes Squad::Blue
                      Assign labels
                      • View project labels
                      Lock merge request
                      Unlocked
                      8
                      8 participants
                      user avatar
                      Emiliano Balbuena
                      user avatar
                      Rami Albatal
                      user avatar
                      Martin Santangelo
                      user avatar
                      Marcelo Rivera
                      user avatar
                      Ben Hayward
                      user avatar
                      Mark Harding
                      user avatar
                      Brian Hatchet
                      Reference: minds/engine!254

                      Revert this merge request

                      This will create a new commit in order to revert the existing changes.

                      Switch branch
                      Cancel
                      A new branch will be created in your fork and a new merge request will be started.

                      Cherry-pick this merge request

                      Switch branch
                      Cancel
                      A new branch will be created in your fork and a new merge request will be started.