Skip to content
Snippets Groups Projects

(Feat) disable comments 526

Merged Brian Hatchet requested to merge feat/disable-comments-526 into master

Merge request reports

Checking pipeline status.

Approved by

Merged by Mark HardingMark Harding 5 years ago (Jul 29, 2019 1:58pm UTC)

Merge details

  • Changes merged into master with 749e79e5 (commits were squashed).
  • Deleted the source branch.

Pipeline #73514979 passed

Pipeline passed for 749e79e5 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • 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'];
  • Brian Hatchet added 13 commits

    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

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading