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 235
    • Issues 235
    • 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
  • !345

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

WIP: [Sprint/OldfashionedOwl](fix): Updated from address in ban email to info@minds.com

Closes #867

Edited 1 hour 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/banned-email-noreply-867" "origin/fix/banned-email-noreply-867"

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/banned-email-noreply-867"

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/banned-email-noreply-867 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #87105549 passed for 1bfab613 on fix/banned-email-noreply-867
          Requires 3 more approvals from Devs, Deployers, and QA.
          Mark Harding
          Mark Harding
          Marcelo Rivera
          Marcelo Rivera
          Martin Santangelo
          Martin Santangelo
          Rami Albatal
          Rami Albatal
          Emiliano Balbuena
          Emiliano Balbuena
          This is a Work in Progress

          Closes #867

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 4
          • Commits 4
          • Pipelines 3
          • Changes 2
          2/2 threads resolved
          • Loading...
          • Ben Hayward @benhayward.ben added Squad::Yellow scoped label 1 week ago

            added Squad::Yellow scoped label

          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
            Resolved by Ben Hayward 1 week ago
          • Emiliano Balbuena @edgebal added MR::Requires Changes scoped label 1 week ago

            added MR::Requires Changes scoped label

          • Ben Hayward @benhayward.ben added 1 commit 1 week ago

            added 1 commit

            • bb7b8621 - Update for feedback

            Compare with previous version

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

            resolved all threads

          • 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
            Mark Harding @markeharding started a thread on the diff 3 days ago
            Resolved by Ben Hayward 1 hour ago
          • Mark Harding @markeharding added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 3 days ago

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

          • Ben Hayward @benhayward.ben added 38 commits 1 hour ago

            added 38 commits

            • bb7b8621...8b7fa6db - 36 commits from branch master
            • 3a6d18e4 - Merge branch 'master' of gitlab.com:minds/engine into fix/banned-email-noreply-867
            • 1bfab613 - Updated settings.example

            Compare with previous version

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

            marked as a Work In Progress

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

            resolved all threads

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 hour ago
            Developer

            I need to test this before I'm happy with it, as I suspect that this is overridden, and the SMTP config specified email is used instead.

          • 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::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          8
          8 participants
          user avatar
          Mark Harding
          user avatar
          Marcelo Rivera
          user avatar
          Martin Santangelo
          user avatar
          Rami Albatal
          user avatar
          Emiliano Balbuena
          user avatar
          Brian Hatchet
          user avatar
          Xander Miller
          Reference: minds/engine!345