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 193
    • Issues 193
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 29
    • Merge Requests 29
  • 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
  • !288

Open
Opened 22 hours 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.

It's not picked up all original changes so likely needs to revert the revert on master then merge this branch to get the last change.

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

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

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 into master
The source branch is 29 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #73895500 passed for 189f6785 on chore/661-misc-fixes
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          Rami Albatal
          Rami Albatal
          Marcelo Rivera
          Marcelo Rivera
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Closes #661 (closed)

          You can merge this merge request manually using the
          • Discussion 1
          • Commits 1
          • Pipelines 1
          • Changes 1
          • Loading...
          • Guy Thouret @gthouret added MR::Ready to Merge scoped label 22 hours ago

            added MR::Ready to Merge scoped label

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

            approved this merge request

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

            @gthouret can you place back in your original changes? Also, are we sure the property check wasn't doing anything?

          • Mark Harding @markeharding added MR::Requires Changes Squad::Blue scoped labels and automatically removed MR::Ready to Merge label 6 minutes ago

            added MR::Requires Changes Squad::Blue scoped labels and automatically removed MR::Ready to Merge label

          • 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
          2
          Labels
          MR::Requires Changes Squad::Blue
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          8
          8 participants
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Rami Albatal
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          Reference: minds/engine!288