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
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 818
    • Issues 818
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 72
    • Merge Requests 72
  • 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
  • !365

Closed
Opened 1 week ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

(feat): update language on juryduty to be more clear

closes https://gitlab.com/minds/front/issues/1420

changes in the text above the post ("Does this content contain...") and buttons:

image

modal for non nsfw reports:

image

modal for nsfw posts:

image

Edited 1 week ago by Marcelo Rivera

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/front.git sprint/HipsterHedgehog.feat.update-language-on-jury-screen-to-be-more-clear
git checkout -b eiennohi/front-sprint/HipsterHedgehog.feat.update-language-on-jury-screen-to-be-more-clear 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/front-sprint/HipsterHedgehog.feat.update-language-on-jury-screen-to-be-more-clear

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-jury-screen-to-be-more-clear into master
  • Email patches
  • Plain diff
Pipeline #67216499 passed for 20cd4dd0 on eiennohi:sprint/HipsterHedgehog.feat.update-language-on-jury-screen-to-be-more-clear
    Merge request approved. Approved by
    Ben Hayward
    Ben Hayward
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Mark Harding
    Mark Harding
    Martin Santangelo
    Martin Santangelo

    Closed by Marcelo Rivera 1 hour ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close #1420

    Deletes source branch

    • Discussion 1
    • Commits 1
    • Pipelines 2
    • Changes 3
    • Loading...
    • Marcelo Rivera @eiennohi changed the description 1 week ago

      changed the description

    • Marcelo Rivera @eiennohi added 1 commit 1 week ago

      added 1 commit

      • 20cd4dd0 - (feat): update language on juryduty to be more clear

      Compare with previous version

    • Emiliano Balbuena @edgebal approved this merge request 1 week ago

      approved this merge request

    • Ben Hayward @benhayward.ben approved this merge request 1 week ago

      approved this merge request

    • Mark Harding @markeharding added MR::Awaiting Review label 9 hours ago

      added MR::Awaiting Review label

    • Marcelo Rivera
      Marcelo Rivera @eiennohi · 1 hour ago
      Developer

      closing in favour of !396

    • Marcelo Rivera @eiennohi closed 1 hour ago

      closed

    • 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
    1
    Labels
    MR::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Brian Hatchet
    user avatar
    Mark Harding
    user avatar
    Martin Santangelo
    user avatar
    Marcelo Rivera
    user avatar
    Ben Hayward
    user avatar
    Emiliano Balbuena
    Reference: minds/front!365