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 231
    • Issues 231
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 40
    • Merge Requests 40
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • 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
  • !361

Closed
Opened 4 days ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: Marketing pages and Wire payments

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "epic/upgrades-page" "origin/epic/upgrades-page"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "epic/upgrades-page"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge epic/upgrades-page into master
  • Email patches
  • Plain diff
Pipeline #88940332 passed for e61f43de on epic/upgrades-page
          Requires 3 more approvals from Devs, Deployers, and QA.
          Rami Albatal
          Rami Albatal
          Ben Hayward
          Ben Hayward
          Mark Harding
          Mark Harding
          Olivia Madrid
          Olivia Madrid
          Martin Santangelo
          Martin Santangelo

          Closed by Emiliano Balbuena 4 minutes ago

          The changes were not merged into master

          Deletes source branch

          • Discussion 0
          • Commits 2
          • Pipelines 2
          • Changes 4
          • Loading...
          • Emiliano Balbuena @edgebal added Squad::Yellow scoped label 4 days ago

            added Squad::Yellow scoped label

          • Mark Harding @markeharding added 1 commit 5 hours ago

            added 1 commit

            • e61f43de - (feat): introduce pro billing for wire

            Compare with previous version

          • Emiliano Balbuena @edgebal closed 4 minutes ago

            closed

          • 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
          Assignee
          Emiliano Balbuena's avatar
          Emiliano Balbuena @edgebal
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          Rami Albatal
          user avatar
          Ben Hayward
          user avatar
          Mark Harding
          user avatar
          Olivia Madrid
          user avatar
          Martin Santangelo
          user avatar
          Marcelo Rivera
          user avatar
          Guy Thouret
          Reference: minds/engine!361