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 241
    • Issues 241
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 30
    • Merge Requests 30
  • 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
  • !217

Open
Opened 2 months ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/HipsterHedgehog] (feat): update language on strike emails

closes https://gitlab.com/minds/engine/issues/547

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/engine.git sprint/HipsterHedgehog.feat.update-language-on-strike-emails
git checkout -b eiennohi/engine-sprint/HipsterHedgehog.feat.update-language-on-strike-emails 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 eiennohi/engine-sprint/HipsterHedgehog.feat.update-language-on-strike-emails

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 eiennohi:sprint/HipsterHedgehog.feat.update-language-on-strike-emails into master
The source branch is 205 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #68312984 passed for bab83784 on eiennohi:sprint/HipsterHedgehog.feat.update-language-on-strike-emails
      Requires 2 more approvals from Devs.
      Brian Hatchet
      Brian Hatchet
      Mark Harding
      Mark Harding
      Emiliano Balbuena
      Emiliano Balbuena
      Rami Albatal
      Rami Albatal
      Martin Santangelo
      Martin Santangelo
      There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

      Allows commits from members who can merge to the target branch

      Deletes source branch

      You can merge this merge request manually using the
      • Discussion 6
      • Commits 7
      • Pipelines 3
      • Changes 10
      4/4 threads resolved
      • Loading...
      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 months ago
        Resolved by Marcelo Rivera 2 months ago
      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 months ago
        Resolved by Marcelo Rivera 2 months ago
      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 months ago
        Resolved by Marcelo Rivera 2 months ago
      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 months ago
        Resolved by Marcelo Rivera 2 months ago
      • Marcelo Rivera @eiennohi added 2 commits 2 months ago

        added 2 commits

        • bed54b21 - (fix): use constants
        • 6f077d7d - (fix): links to Content Policy

        Compare with previous version

      • Marcelo Rivera @eiennohi added 1 commit 2 months ago

        added 1 commit

        • bab83784 - (fix): file name for non-nsfw moderation strike template

        Compare with previous version

      • Marcelo Rivera @eiennohi resolved all discussions 2 months ago

        resolved all discussions

      • Mark Harding @markeharding added MR::Awaiting Review scoped label 1 month ago

        added MR::Awaiting Review scoped label

      • Mark Harding @markeharding added Squad::Yellow scoped label 1 month ago

        added Squad::Yellow scoped label

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

        Merge conflicts in this, happy to take a look when resolved

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