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 197
    • Issues 197
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 39
    • Merge Requests 39
  • 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

Our Privacy Policy has changed, please visit https://about.gitlab.com/privacy to review these changes.

Open
Opened 1 week ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[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.

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
The source branch is 22 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #84125635 passed for 5559e8de on fix/report-reason-email-765
          Requires 2 more approvals from Devs and Deployers.
          Emiliano Balbuena
          Emiliano Balbuena
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 5
          • Commits 4
          • Pipelines 4
          • Changes 3
          2/3 threads resolved
          • Loading...
          • Ben Hayward @benhayward.ben added MR::Requires Changes Squad::Yellow scoped labels 1 week 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 1 week 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 1 week 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 4 days ago
            Resolved by Ben Hayward 1 day ago
          • Ben Hayward
            Ben Hayward @benhayward.ben started a thread on an old version of the diff 4 days ago
            Resolved by Ben Hayward 1 day ago
          • Ben Hayward @benhayward.ben added 1 commit 1 day 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 1 day ago

            added 1 commit

            • 117f089c - Accidental commit

            Compare with previous version

          • Ben Hayward @benhayward.ben resolved all threads 1 day ago

            resolved all threads

          • Ben Hayward @benhayward.ben added 1 commit 1 day 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 1 day ago

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

          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on the diff 3 hours ago
            Last updated by Emiliano Balbuena 1 hour ago
            Core/Reports/Events.php
            23 30 ->setBody('banned.tpl')
            24 31 ->set('username', $user->username)
            25 32 ->set('email', $user->getEmail())
            26 ->set('reason', $user->ban_reason)
            33 ->set('reason', getBanReasons($user->ban_reason))
            • Marcelo Rivera
              Marcelo Rivera @eiennohi · 3 hours ago
              Developer

              I think this is a bit more complicated, as I found a few inconsistencies throughout our codebase:

              expects indices separated by "." (like reason.subreason)? https://gitlab.com/minds/front/blob/master/src%2Fapp%2Fmodules%2Freport%2Fbanned%2Fbanned.component.ts#L45

              This equals the reason label. It later inserts it in $user->ban_reason line 67: https://gitlab.com/minds/engine/blob/master/Controllers%2Fapi%2Fv1%2Fadmin%2Fban.php#L60

              inserts an index here: https://gitlab.com/minds/engine/blob/master/Core%2FSecurity%2FAbuseGuard%2FBan.php#L51

              inserts a string here: https://gitlab.com/minds/engine/blob/master/Controllers%2FCli%2FSnapshot.php#L79

            • Emiliano Balbuena
              Emiliano Balbuena @edgebal · 1 hour ago
              Developer

              Missing $this

            • Please register or sign in to reply
          • Ben Hayward @benhayward.ben mentioned in issue #868 1 hour ago

            mentioned in issue #868

          • 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
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          Reference: minds/engine!328