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 820
    • Issues 820
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 47
    • Merge Requests 47
  • 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
  • !426

Open
Opened 2 weeks ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

(Feat) disable comments 526

Edited 2 weeks ago by Brian Hatchet

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/disable-comments-526 origin/feat/disable-comments-526

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 feat/disable-comments-526

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 feat/disable-comments-526 into master
The source branch is 6 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #72293605 passed for b9591e71 on feat/disable-comments-526
          Merge request approved. Approved by
          Marcelo Rivera
          Marcelo Rivera
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          Emiliano Balbuena
          Emiliano Balbuena
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 22
          • Commits 30
          • Pipelines 12
          • Changes 25
          7/9 threads resolved
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Interesting Iguana 2 weeks ago

            changed milestone to %sprint: Interesting Iguana

          • Brian Hatchet :speech_balloon: @brianhatchet changed title from Feat/disable comments 526 to (Feat) disable comments 526 2 weeks ago

            changed title from Feat/disable comments 526 to (Feat) disable comments 526

          • Brian Hatchet :speech_balloon: @brianhatchet added 4 commits 2 weeks ago

            added 4 commits

            • b8f503ae...d7f9cc7d - 3 commits from branch master
            • e93b4129 - Merge remote-tracking branch 'upstream/master' into feat/disable-comments-526

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 2 weeks ago

            added 1 commit

            • 032dc9ae - fixing comment allowComment access leve

            Compare with previous version

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

            approved this merge request

          • Mark Harding @markeharding added MR::Awaiting Review scoped label 1 week ago

            added MR::Awaiting Review scoped label

          • Brian Hatchet :speech_balloon: @brianhatchet added 8 commits 1 week ago

            added 8 commits

            • 032dc9ae...12a0ab82 - 6 commits from branch master
            • b3689ba5 - Merge branch 'master' of gitlab.com:minds/front
            • 4b51976e - Merge branch 'master' into feat/disable-comments-526

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 1 week ago

            added 1 commit

            • 95ca222a - Adding 'allow-comments-toggle' feature. Setting featuresservice assumption to false

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 45 commits 1 week ago

            added 45 commits

            • 95ca222a...bda69088 - 44 commits from branch master
            • 48216571 - Merge remote-tracking branch 'origin/master' into feat/disable-comments-526

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 12 commits 1 week ago

            added 12 commits

            • 48216571...3fad9777 - 11 commits from branch master
            • 5c29a195 - Merge remote-tracking branch 'upstream/master' into feat/disable-comments-526

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
            Resolved by Brian Hatchet 6 days ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
            Last updated by Brian Hatchet 1 day ago
            src/app/modules/comments/comment/comment.component.ts
            87 94 private overlayModal: OverlayModalService,
            88 95 private cd: ChangeDetectorRef,
            89 96 private timeDiffService: TimeDiffService,
            90 private el: ElementRef
            97 private el: ElementRef,
            98 protected activityService: ActivityService
            91 99 ) {}
            92 100
            93 101 ngOnInit() {
            94 102 this.commentAge$ = this.timeDiffService.source.pipe(map(secondsElapsed => {
            95 103 return (this.comment.time_created - secondsElapsed * 0.01) * 1000;
            96 104 }));
            105 this.canReply = this.entity['allow_comments'];
            • Mark Harding
              Mark Harding @markeharding · 1 week ago
              Owner

              q. should this be instantiated from the tree/thread level?

            • Emiliano Balbuena
              Emiliano Balbuena @edgebal · 1 week ago
              Developer

              Adhering to Mark's question here. Remember that, if you don't want to be passing the property through the whole tree, you can also use a shared just-for-state @Injectable() service using providers: [] on the top level component (the comments list container), and injecting it on the constructor() part of the children components.

            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 6 days ago
              Maintainer

              I am confused. I am pretty sure that is exactly what I am doing.

              Provided here. https://gitlab.com/minds/front/blob/feat/disable-comments-526/src/app/modules/comments/list/list.component.ts#L28

              Then I just inject it into whatever component needs to respond at the constructor level.

            • Brian Hatchet :speech_balloon: @brianhatchet changed this line in version 10 of the diff 1 day ago

              changed this line in version 10 of the diff

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
            Resolved by Brian Hatchet 3 days ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
            Resolved by Brian Hatchet 3 days ago
          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
            Resolved by Brian Hatchet 3 days ago
          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
            Resolved by Brian Hatchet 3 days ago
          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
            Resolved by Brian Hatchet 3 days ago
          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
            Resolved by Brian Hatchet 3 days ago
          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
            Last updated by Brian Hatchet 1 day ago
            src/app/modules/blogs/view/view.ts
            40 43
            41 44 scroll_listener;
            42 45
            43 menuOptions: Array<string> = ['edit', 'follow', 'feature', 'delete', 'report', 'subscribe', 'set-explicit', 'remove-explicit', 'rating'];
            46 menuOptions: Array<string> = ['edit', 'follow', 'feature',
            47 'delete', 'report', 'subscribe',
            48 'set-explicit', 'remove-explicit', 'rating',
            49 'allow-comments', 'disable-comments'];
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal · 1 week ago
              Developer

              Check my comment above re: toggles using the same option ID.

            • Brian Hatchet :speech_balloon: @brianhatchet changed this line in version 10 of the diff 1 day ago

              changed this line in version 10 of the diff

            • Please register or sign in to reply
          • Brian Hatchet :speech_balloon: @brianhatchet added 13 commits 6 days ago

            added 13 commits

            • 5c29a195...87b682c6 - 12 commits from branch master
            • 7093e8d1 - Merge remote-tracking branch 'origin/master' into feat/disable-comments-526

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 6 days ago

            added 1 commit

            • 3ebd1846 - CR changes

            Compare with previous version

          • Mark Harding @markeharding added Squad::Green scoped label 6 days ago

            added Squad::Green scoped label

          • Marcelo Rivera @eiennohi approved this merge request 3 days ago

            approved this merge request

          • Brian Hatchet :speech_balloon: @brianhatchet added 20 commits 1 day ago

            added 20 commits

            • 3ebd1846...157e56d4 - 17 commits from branch master
            • 97042103 - Merge remote-tracking branch 'origin/master' into feat/disable-comments-526
            • 4ce3fc42 - Merge remote-tracking branch 'origin/master' into feat/disable-comments-526
            • f76b770f - CR changes and BehaviorSubject overhaul

            Compare with previous version

            Toggle commit list
          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 23 hours ago

            added 1 commit

            • 709bb089 - Fixing builds

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 23 hours ago

            added 1 commit

            • b9591e71 - One more typo fix

            Compare with previous version

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

            approved this merge request

          • Mark Harding
            Mark Harding @markeharding · 6 hours ago
            Owner

            Looks good to me. Lets get another approval and we can merge in

          • Marcelo Rivera @eiennohi approved this merge request 3 hours ago

            approved this merge request

          • 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
          Brian Hatchet's avatar Brian Hatchet @brianhatchet
          Assign to
          sprint: Interesting Iguana
          Milestone
          sprint: Interesting Iguana
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          2
          Labels
          MR::Awaiting Review Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          6
          6 participants
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Emiliano Balbuena
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          user avatar
          Mark Harding
          Reference: minds/front!426