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 51
    • Merge Requests 51
  • 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
  • !316

Open
Opened 39 minutes ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

WIP: [Sprint/FunnyFrog](bug): Fixed bugs with reminds not respecting NSFW state of a post

Closing minds#428

Seems to be that some quirk of Javascript was causing the issues here. The old line

Edited 14 minutes ago by Ben Hayward

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git nsfw-broken-for-reminds-#428
git checkout -b benhayward.ben/front-nsfw-broken-for-reminds-#428 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 benhayward.ben/front-nsfw-broken-for-reminds-#428

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 benhayward.ben:nsfw-broken-for-reminds-#428 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #62688015 passed for 81096e03 on benhayward.ben:nsfw-broken-for-reminds-#428
    Requires 2 more approvals from Devs.
    Brian Hatchet
    Brian Hatchet
    Marcelo Rivera
    Marcelo Rivera
    Emiliano Balbuena
    Emiliano Balbuena
    Mark Harding
    Mark Harding
    Martin Santangelo
    Martin Santangelo
    This is a Work in Progress
    Allows commits from members who can merge to the target branch

    Closes minds#428

    Deletes source branch

    You can merge this merge request manually using the
    • Discussion 0
    • Commits 1
    • Pipelines 1
    • Changes 1
    • Loading...
    • Ben Hayward @benhayward.ben changed the description 35 minutes ago

      changed the description

    • Ben Hayward @benhayward.ben marked as a Work In Progress 14 minutes ago

      marked as a Work In Progress

    • Ben Hayward @benhayward.ben changed the description 14 minutes ago

      changed the description

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