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 807
    • Issues 807
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 53
    • Merge Requests 53
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !454

Open
Opened 10 hours ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/InterestingIguana] (fix): resolve comments by urn

closes engine#457 (closed) depends on engine!262 (merged)

Edited 10 hours 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 fix/resolve-comments-by-urn
git checkout -b eiennohi/front-fix/resolve-comments-by-urn 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-fix/resolve-comments-by-urn

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:fix/resolve-comments-by-urn into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #71316617 failed for 8a5bdcd8 on eiennohi:fix/resolve-comments-by-urn
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Ben Hayward
          Ben Hayward
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo

          Set by Mark Harding to be merged automatically when the pipeline succeeds

          The changes will be merged into master

          The source branch will be deleted

          Allows commits from members who can merge to the target branch

          Closes engine#457 (closed)

          Deletes source branch

          • Discussion 2
          • Commits 4
          • Pipelines 2
          • Changes 7
          • Loading...
          • Marcelo Rivera @eiennohi mentioned in merge request engine!262 (merged) 10 hours ago

            mentioned in merge request engine!262 (merged)

          • Marcelo Rivera @eiennohi changed the description 10 hours ago

            changed the description

          • Mark Harding
            Mark Harding @markeharding · 7 hours ago
            Owner
            • Reported Content page in settings not rendering
            • Reported Content page should say 'This comment has been...'
          • Marcelo Rivera @eiennohi added 3 commits 6 hours ago

            added 3 commits

            • b6f6ddb2 - (fix): show comments in appeal console
            • 56f33c3f - (fix): re-added border to comments in juryduty
            • 8a5bdcd8 - (fix): distinguish between posts and comments in reports console

            Compare with previous version

          • Mark Harding @markeharding approved this merge request 6 hours ago

            approved this merge request

          • Mark Harding @markeharding enabled an automatic merge when the pipeline for 8a5bdcd8 succeeds 6 hours ago

            enabled an automatic merge when the pipeline for 8a5bdcd8 succeeds

          • Ben Hayward
            Ben Hayward @benhayward.ben · 2 hours ago
            Developer

            @markeharding @eiennohi pipeline has failed here

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