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

Open
Opened 37 minutes 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 37 minutes 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
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67216499 passed for 20cd4dd0 on eiennohi:sprint/HipsterHedgehog.feat.update-language-on-jury-screen-to-be-more-clear
    Requires 2 more approvals from Devs.
    Martin Santangelo
    Martin Santangelo
    Mark Harding
    Mark Harding
    Brian Hatchet
    Brian Hatchet
    Ben Hayward
    Ben Hayward
    Emiliano Balbuena
    Emiliano Balbuena
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request

    Allows commits from members who can merge to the target branch

    Closes #1420

    Deletes source branch

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

      changed the description

    • Marcelo Rivera @eiennohi added 1 commit 35 minutes ago

      added 1 commit

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

      Compare with previous version

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