Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 899
    • Issues 899
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 45
    • Merge Requests 45
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !517

Closed
Opened 2 weeks ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

WIP: [Sprint/LuckyLizard](feat): Wallet redesign base

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/wallet-redesign-base-1616 origin/feat/wallet-redesign-base-1616

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 feat/wallet-redesign-base-1616

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 feat/wallet-redesign-base-1616 into master
  • Email patches
  • Plain diff
Pipeline #78675031 failed for 454fa686 on feat/wallet-redesign-base-1616
            Requires 2 more approvals from Devs and Deployers.
            Marcelo Rivera
            Marcelo Rivera
            Juan Manuel Solaro
            Juan Manuel Solaro
            Olivia Madrid
            Olivia Madrid
            Martin Santangelo
            Martin Santangelo
            Emiliano Balbuena
            Emiliano Balbuena

            Closed by Ben Hayward 23 minutes ago

            The changes were not merged into master

            Deletes source branch

            • Discussion 0
            • Commits 3
            • Pipelines 3
            • Changes 20
            • Loading...
            • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

              added 1 commit

              • 80d7ca92 - Accidental commit

              Compare with previous version

            • Ben Hayward @benhayward.ben mentioned in issue #1617 2 weeks ago

              mentioned in issue #1617

            • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

              added 1 commit

              • 454fa686 - Updated so that this is now at wallet/new and old comp works

              Compare with previous version

            • Ben Hayward @benhayward.ben closed 23 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
            0 Assignees
            None
            Assign to
            None
            Milestone
            None
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            0
            Labels
            None
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            9
            9 participants
            user avatar
            Marcelo Rivera
            user avatar
            Juan Manuel Solaro
            user avatar
            Olivia Madrid
            user avatar
            Martin Santangelo
            user avatar
            Emiliano Balbuena
            user avatar
            Brian Hatchet
            user avatar
            Guy Thouret
            Reference: minds/front!517