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 48
    • Merge Requests 48
  • 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

Merged
Opened 12 hours ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

(refactor): Deprecate CockroachDB

Edited 10 hours 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
  • Email patches
  • Plain diff
Pipeline #69159322 passed for 01f4e4e6 on hotfix/cdb-deprec-569
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet

          Merged by Mark Harding just now

          The changes were merged into master with 69359005

          Pipeline #69161724 pending for 69359005 on master
                  • Discussion 3
                  • Commits 7
                  • Pipelines 5
                  • Changes 27
                  2/2 discussions resolved
                  • Loading...
                  • Mark Harding
                    Mark Harding @markeharding started a discussion on an old version of the diff 12 hours ago
                    Resolved by Emiliano Balbuena 11 hours ago
                  • Mark Harding
                    Mark Harding @markeharding started a discussion on an old version of the diff 12 hours ago
                    Resolved by Emiliano Balbuena 11 hours ago
                  • Emiliano Balbuena @edgebal added 2 commits 11 hours ago

                    added 2 commits

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

                    Compare with previous version

                  • Emiliano Balbuena @edgebal resolved all discussions 11 hours ago

                    resolved all discussions

                  • Mark Harding @markeharding added MR::Ready to Merge label 10 hours ago

                    added MR::Ready to Merge label

                  • Emiliano Balbuena @edgebal unmarked as a Work In Progress 10 hours ago

                    unmarked as a Work In Progress

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

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

                  • Mark Harding @markeharding approved this merge request 10 hours ago

                    approved this merge request

                  • Mark Harding
                    Mark Harding @markeharding · 10 hours ago
                    Owner

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

                  • Marcelo Rivera @eiennohi approved this merge request 10 hours ago

                    approved this merge request

                  • Mark Harding @markeharding added 1 commit 47 minutes ago

                    added 1 commit

                    • a9152cfa - (chore): use Bigint vs Varint

                    Compare with previous version

                  • Mark Harding @markeharding added 1 commit 22 minutes ago

                    added 1 commit

                    • cce6c50c - (chore): single notifications now through cassandra

                    Compare with previous version

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

                    approved this merge request

                  • Mark Harding @markeharding added MR::Ready to Merge label and removed MR::Awaiting Review label 22 minutes ago

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

                  • Mark Harding @markeharding added 1 commit 12 minutes ago

                    added 1 commit

                    • 01f4e4e6 - (fix): test to use cassandra notifications

                    Compare with previous version

                  • Mark Harding @markeharding approved this merge request 1 minute ago

                    approved this merge request

                  • Mark Harding @markeharding merged just now

                    merged

                  • Mark Harding @markeharding mentioned in commit 69359005 just now

                    mentioned in commit 69359005

                  • 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::Ready to Merge
                  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
                  Marcelo Rivera
                  user avatar
                  Brian Hatchet
                  user avatar
                  Emiliano Balbuena
                  user avatar
                  Mark Harding
                  Reference: minds/engine!245

                  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.