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
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 807
    • Issues 807
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 51
    • Merge Requests 51
  • 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
  • !350

Closed
Opened 1 month ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

(fix): Self-healing IDB store

Check out, review, and merge locally

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

git fetch https://gitlab.com/edgebal/front.git hotfix/idb-corruption-1
git checkout -b edgebal/front-hotfix/idb-corruption-1 FETCH_HEAD

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 edgebal/front-hotfix/idb-corruption-1

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 edgebal:hotfix/idb-corruption-1 into master
  • Email patches
  • Plain diff
Pipeline #65957107 passed for 0e506f69 on edgebal:hotfix/idb-corruption-1
    Requires 2 more approvals from Devs.
    Martin Santangelo
    Martin Santangelo
    Marcelo Rivera
    Marcelo Rivera
    Ben Hayward
    Ben Hayward
    Brian Hatchet
    Brian Hatchet
    Mark Harding
    Mark Harding

    Closed by Mark Harding 3 minutes ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Deletes source branch

    • Discussion 8
    • Commits 2
    • Pipelines 2
    • Changes 4
    3/3 threads resolved
    • Loading...
    • Emiliano Balbuena @edgebal added 1 commit 1 month ago

      added 1 commit

      • 0e506f69 - (chore): Missing semicolons

      Compare with previous version

    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 month ago
      Resolved by Emiliano Balbuena 3 weeks ago
    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 month ago
      Resolved by Emiliano Balbuena 3 weeks ago
    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 month ago
      Resolved by Emiliano Balbuena 3 weeks ago
    • Mark Harding
      Mark Harding @markeharding · 3 weeks ago
      Owner

      @edgebal some follow up items here

    • Emiliano Balbuena @edgebal resolved all discussions 3 weeks ago

      resolved all discussions

    • Mark Harding @markeharding added MR::Awaiting Review scoped label 2 weeks ago

      added MR::Awaiting Review scoped label

    • Mark Harding @markeharding added Squad::Yellow scoped label 3 minutes ago

      added Squad::Yellow scoped label

    • Mark Harding
      Mark Harding @markeharding · 3 minutes ago
      Owner

      closing as now in memory

    • Mark Harding @markeharding closed 3 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
    2
    Labels
    MR::Awaiting Review Squad::Yellow
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Martin Santangelo
    user avatar
    Marcelo Rivera
    user avatar
    Ben Hayward
    user avatar
    Brian Hatchet
    user avatar
    Mark Harding
    user avatar
    Emiliano Balbuena
    Reference: minds/front!350