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 894
    • Issues 894
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 50
    • Merge Requests 50
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !508

Open
Opened 1 week ago by Mark Harding@markeharding
  • Report abuse
Report abuse

Epic/37 wire

Depends on engine!254

Edited 1 day ago by Mark Harding

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/37-wire origin/epic/37-wire

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/37-wire

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/37-wire into master
The source branch is 7 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #78978901 passed with warnings for f35f5671 on epic/37-wire
              Merge request approved. Approved by
              Brian Hatchet
              Brian Hatchet
              Guy Thouret
              Guy Thouret
              Martin Santangelo
              Martin Santangelo
              Marcelo Rivera
              Marcelo Rivera
              Emiliano Balbuena
              Emiliano Balbuena
              Juan Manuel Solaro
              Juan Manuel Solaro
              There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

              Deletes source branch

              You can merge this merge request manually using the
              • Discussion 6
              • Commits 13
              • Pipelines 10
              • Changes 51
              3/3 threads resolved
              • Loading...
              • Mark Harding @markeharding changed the description 1 week ago

                changed the description

              • Mark Harding @markeharding mentioned in merge request engine!254 1 week ago

                mentioned in merge request engine!254

              • Mark Harding @markeharding marked as a Work In Progress 1 week ago

                marked as a Work In Progress

              • Mark Harding @markeharding added 121 commits 5 days ago

                added 121 commits

                • 06d5f495...6a48c5b1 - 119 commits from branch master
                • 0fa095f2 - Merge branch 'master' of gitlab.com:minds/front into epic/37-wire
                • 153f98d7 - (feat): put everything behind a feature flag

                Compare with previous version

              • Mark Harding @markeharding added 1 commit 5 days ago

                added 1 commit

                • 7feb3e46 - (chore): bump package lock

                Compare with previous version

              • Mark Harding @markeharding added 20 commits 1 day ago

                added 20 commits

                • 7feb3e46...5ed6e576 - 18 commits from branch master
                • c822fc52 - (fix): move usd into canary flag
                • dbe41ee5 - Merge branch 'master' of gitlab.com:minds/front into epic/37-wire

                Compare with previous version

              • Mark Harding @markeharding unmarked as a Work In Progress 1 day ago

                unmarked as a Work In Progress

              • Brian Hatchet
                Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
                Resolved by Mark Harding 3 hours ago
              • Brian Hatchet
                Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
                Resolved by Mark Harding 3 hours ago
              • Brian Hatchet
                Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
                Resolved by Brian Hatchet 50 minutes ago
              • Mark Harding @markeharding added 1 commit 2 hours ago

                added 1 commit

                • 9cd7db59 - (chore): use new more restful endpoints

                Compare with previous version

              • Mark Harding @markeharding added 1 commit 1 hour ago

                added 1 commit

                • f35f5671 - (chore): use new more restful endpoints

                Compare with previous version

              • Brian Hatchet :speech_balloon: @brianhatchet resolved all threads 50 minutes ago

                resolved all threads

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

                approved this merge request

              • 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
              Mark Harding's avatar Mark Harding @markeharding
              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
              Guy Thouret
              user avatar
              Martin Santangelo
              user avatar
              Marcelo Rivera
              user avatar
              Emiliano Balbuena
              user avatar
              Juan Manuel Solaro
              user avatar
              Olivia Madrid
              user avatar
              Ben Hayward
              Reference: minds/front!508