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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 129
    • Issues 129
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 26
    • Merge Requests 26
  • 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
  • !169

Merged
Opened 4 days ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/ElevatedEagle] (feat) add report reasons to config endpoint

Add to settings.php: https://gitlab.com/minds/engine/blob/bd6e7d55a98e733587c0c9d028e6c8037a0c1166/settings.example.php#L49

Check out, review, and merge locally

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

git fetch https://gitlab.com/msantang78/engine.git sprint/ElevatedEagle.feat.report-reasons.added.minds-config.endpoint
git checkout -b msantang78/engine-sprint/ElevatedEagle.feat.report-reasons.added.minds-config.endpoint 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 msantang78/engine-sprint/ElevatedEagle.feat.report-reasons.added.minds-config.endpoint

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 msantang78:sprint/ElevatedEagle.feat.report-reasons.added.minds-config.endpoint into master
  • Email patches
  • Plain diff
Pipeline #61911812 passed for bd6e7d55 on msantang78:sprint/ElevatedEagle.feat.report-reasons.added.minds-config.endpoint
      Merge request approved. Approved by
      Mark Harding
      Mark Harding

      Merged by Mark Harding 9 minutes ago

      The changes were merged into master with 56b60f52

      Pipeline #62575596 passed for 56b60f52 on master
            • Discussion 0
            • Commits 1
            • Pipelines 1
            • Changes 2
            • Loading...
            • Martin Santangelo @msantang78 mentioned in merge request !167 (closed) 4 days ago

              mentioned in merge request !167 (closed)

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

              approved this merge request

            • Mark Harding @markeharding unapproved this merge request 10 minutes ago

              unapproved this merge request

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

              approved this merge request

            • Mark Harding @markeharding unapproved this merge request 9 minutes ago

              unapproved this merge request

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

              approved this merge request

            • Mark Harding @markeharding merged 9 minutes ago

              merged

            • Mark Harding @markeharding mentioned in commit 56b60f52 9 minutes ago

              mentioned in commit 56b60f52

            • 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
            None
            Assign to
            None
            Milestone
            None
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            0
            Labels
            None
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            2
            2 participants
            user avatar
            Mark Harding
            user avatar
            Martin Santangelo
            Reference: minds/engine!169

            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.