Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 799
    • Issues 799
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 50
    • Merge Requests 50
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !307

Merged
Opened 2 days ago by Mark Harding@markeharding
  • Report abuse
Report abuse

Epic/reporting and moderation

Check out, review, and merge locally

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

git fetch origin
git checkout -b epic/ReportingAndModeration origin/epic/ReportingAndModeration

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 epic/ReportingAndModeration

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 epic/ReportingAndModeration into master
  • Email patches
  • Plain diff
Pipeline #62745075 passed for dd47771c on epic/ReportingAndModeration
    Requires 2 more approvals from Devs.
    Marcelo Rivera
    Marcelo Rivera
    Emiliano Balbuena
    Emiliano Balbuena
    Martin Santangelo
    Martin Santangelo
    Brian Hatchet
    Brian Hatchet
    Ben Hayward
    Ben Hayward

    Merged by Mark Harding 4 minutes ago

    The changes were merged into master with ad7549d3

    Closed #1314 (closed)

    Pipeline #62751604 running for ad7549d3 on master
          • Discussion 0
          • Commits 40
          • Pipelines 32
          • Changes 51
          • Loading...
          • Emiliano Balbuena @edgebal added 1 commit 2 days ago

            added 1 commit

            • 4a2e6f84 - (fix): Hide disabled scrollbars on Windows

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 day ago

            added 1 commit

            • 4f441f87 - (feat): add appeals to strikes page

            Compare with previous version

          • Mark Harding @markeharding added 2 commits 1 day ago

            added 2 commits

            • 4a69c7e4 - (chore): minor changes to marketing page
            • e7c688b0 - (chore): remove moderation page redirect

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 day ago

            added 1 commit

            • 36241c0d - (fix): appeal page should wrap tabs

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 23 hours ago

            added 1 commit

            • aff31974 - (chore): only use scrollable area if needed

            Compare with previous version

          • Mark Harding @markeharding added 3 commits 40 minutes ago

            added 3 commits

            • b9e60e86 - (fix): do not resummon if modal open
            • 5802bcca - (chore): rework the stats
            • dd47771c - (feat): new tos-updates

            Compare with previous version

          • Mark Harding @markeharding merged 4 minutes ago

            merged

          • 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
          6
          6 participants
          user avatar
          Marcelo Rivera
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Ben Hayward
          user avatar
          Mark Harding
          Reference: minds/front!307

          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.