Skip to content

Next

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

Open
Opened 2 hours ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

(refactor): Deprecate CockroachDB

Edited 53 minutes ago by Emiliano Balbuena

Check out, review, and merge locally

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

git fetch origin
git checkout -b hotfix/cdb-deprec-569 origin/hotfix/cdb-deprec-569

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 hotfix/cdb-deprec-569

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 hotfix/cdb-deprec-569 into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #69096047 passed for c4d7ec3c on hotfix/cdb-deprec-569
          Merge request approved. Approved by
          Marcelo Rivera
          Marcelo Rivera
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          Brian Hatchet
          Brian Hatchet
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 3
          • Commits 4
          • Pipelines 2
          • Changes 26
          2/2 discussions resolved
          • Loading...
          • Mark Harding
            Mark Harding @markeharding started a discussion on an old version of the diff 2 hours ago
            Resolved by Emiliano Balbuena 1 hour ago
          • Mark Harding
            Mark Harding @markeharding started a discussion on an old version of the diff 2 hours ago
            Resolved by Emiliano Balbuena 1 hour ago
          • Emiliano Balbuena @edgebal added 2 commits 1 hour ago

            added 2 commits

            • 5fe18e0e - (refactor): Deprecate Suggested
            • c4d7ec3c - (test): Fix spec tests

            Compare with previous version

          • Emiliano Balbuena @edgebal resolved all discussions 1 hour ago

            resolved all discussions

          • Mark Harding @markeharding added MR::Ready to Merge label 53 minutes ago

            added MR::Ready to Merge label

          • Emiliano Balbuena @edgebal unmarked as a Work In Progress 53 minutes ago

            unmarked as a Work In Progress

          • Emiliano Balbuena @edgebal added MR::Awaiting Review label and removed MR::Ready to Merge label 53 minutes ago

            added MR::Awaiting Review label and removed MR::Ready to Merge label

          • Mark Harding @markeharding approved this merge request 53 minutes ago

            approved this merge request

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

            Works well for me. I will copy the hidden hashtags over tomorrow morning.

          • Marcelo Rivera @eiennohi approved this merge request 9 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
          Emiliano Balbuena's avatar Emiliano Balbuena @edgebal
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          MR::Awaiting Review
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          user avatar
          Mark Harding
          Reference: minds/engine!245