Skip to content

Next

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

Open
Opened 1 hour ago by Guy Thouret@gthouret
  • Report abuse
Report abuse

Fixes for various blocking and unblocking errors/warnings in dev environment

Fixes #661 (closed)

Includes fix for regression to Core\Entities.

Reverted the revert on master then cherry picked the additional change so all history is retained.

Edited 1 hour ago by Guy Thouret

Check out, review, and merge locally

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

git fetch origin
git checkout -b chore/661-misc-fixes-2 origin/chore/661-misc-fixes-2

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 chore/661-misc-fixes-2

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 chore/661-misc-fixes-2 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #77742947 passed for e8b05be2 on chore/661-misc-fixes-2
          Requires 2 more approvals from Devs and Deployers.
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Ben Hayward
          Ben Hayward
          Marcelo Rivera
          Marcelo Rivera
          Martin Santangelo
          Martin Santangelo
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #661 (closed)

          • Discussion 0
          • Commits 2
          • Pipelines 1
          • Changes 12
          • Loading...
          • Guy Thouret @gthouret added MR::Awaiting Review Priority::4 - Trivial Squad::Blue Type::Chore scoped labels 1 hour ago

            added MR::Awaiting Review Priority::4 - Trivial Squad::Blue Type::Chore scoped labels

          • Guy Thouret @gthouret changed the description 1 hour ago

            changed the description

          • 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
          0 Assignees
          None
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          4
          Labels
          MR::Awaiting Review Priority::4 - Trivial Squad::Blue Type::Chore
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          8
          8 participants
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Ben Hayward
          user avatar
          Marcelo Rivera
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          user avatar
          Brian Hatchet
          Reference: minds/engine!297