Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 800
    • Issues 800
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 44
    • Merge Requests 44
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !282

Merged
Opened 3 weeks ago by Mark Harding@markeharding
  • Report abuse
Report abuse

Epic/onchain improvements

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/onchainImprovements origin/epic/onchainImprovements

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/onchainImprovements

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/onchainImprovements into master
  • Email patches
  • Plain diff
Pipeline #62973767 passed for d3c3b508 on epic/onchainImprovements
    Requires 2 more approvals from Devs.
    Marcelo Rivera
    Marcelo Rivera
    Ben Hayward
    Ben Hayward
    Martin Santangelo
    Martin Santangelo
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet

    Merged by Mark Harding 46 minutes ago

    The changes were merged into master with 2817a391

    Pipeline #62975662 passed for 2817a391 on master
          • Discussion 0
          • Commits 5
          • Pipelines 4
          • Changes 27
          • Loading...
          • Mark Harding @markeharding mentioned in merge request !279 (closed) 3 weeks ago

            mentioned in merge request !279 (closed)

          • Mark Harding @markeharding added 1 commit 3 weeks ago

            added 1 commit

            • 2a627f99 - (fix): show correct eth balance

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 22 hours ago

            added 1 commit

            • 639a433e - (feat): eth purchase modal

            Compare with previous version

          • Mark Harding @markeharding added 2 commits 57 minutes ago

            added 2 commits

            • 9238d798 - (feature) Metamask download prompts in our transaction overlays
            • d3c3b508 - Merge branch 'metamask-buy-token-modal' into 'epic/onchainImprovements'

            Compare with previous version

          • Mark Harding @markeharding merged 46 minutes ago

            merged

          • 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
          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
          6
          6 participants
          user avatar
          Marcelo Rivera
          user avatar
          Ben Hayward
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          Reference: minds/front!282

          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.