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 227
    • Issues 227
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 33
    • Merge Requests 33
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • 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
  • !328

Open
Opened 3 weeks ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

WIP: [Sprint/NuancedNumbat](fix): Ban email now returning string of ban reason rather than index.

Need to test this on the sandbox. Marking as requires changes until I have.

Edited 1 week ago by Ben Hayward

Check out, review, and merge locally

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

git fetch origin
git checkout -b "fix/report-reason-email-765" "origin/fix/report-reason-email-765"

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 "fix/report-reason-email-765"

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 fix/report-reason-email-765 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #87716858 running for c4809d98 on fix/report-reason-email-765
          Requires 2 more approvals from Devs and Deployers.
          Rami Albatal
          Rami Albatal
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet
          This is a Work in Progress

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 6
          • Commits 7
          • Pipelines 6
          • Changes 3
          3/3 threads resolved
          • Loading...
          • Ben Hayward @benhayward.ben added MR::Requires Changes Squad::Yellow scoped labels 3 weeks ago

            added MR::Requires Changes Squad::Yellow scoped labels

          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label 3 weeks ago

            added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label

          • Mark Harding @markeharding added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 3 weeks ago

            added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label

          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on an old version of the diff 2 weeks ago
            Resolved by Ben Hayward 2 weeks ago
          • Ben Hayward
            Ben Hayward @benhayward.ben started a thread on an old version of the diff 2 weeks ago
            Resolved by Ben Hayward 2 weeks ago
          • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

            added 1 commit

            • c96f482e - Changed location of call and put ban reasons in settings

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

            added 1 commit

            • 117f089c - Accidental commit

            Compare with previous version

          • Ben Hayward @benhayward.ben resolved all threads 2 weeks ago

            resolved all threads

          • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

            added 1 commit

            • 5559e8de - Linting

            Compare with previous version

          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label 2 weeks ago

            added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label

          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 2 weeks ago
            Resolved by Ben Hayward 3 minutes ago
          • Ben Hayward @benhayward.ben mentioned in issue #868 2 weeks ago

            mentioned in issue #868

          • Ben Hayward @benhayward.ben added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 1 week ago

            added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label

          • Ben Hayward @benhayward.ben marked as a Work In Progress 1 week ago

            marked as a Work In Progress

          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label 1 week ago

            added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label

          • Mark Harding @markeharding closed 1 day ago

            closed

          • Ben Hayward @benhayward.ben reopened 11 minutes ago

            reopened

          • Ben Hayward @benhayward.ben added 1 commit 10 minutes ago

            added 1 commit

            • c4809d98 - Added $this

            Compare with previous version

          • Ben Hayward @benhayward.ben resolved all threads 3 minutes ago

            resolved all threads

          • 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::Awaiting Review Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          Reference: minds/engine!328