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 827
    • Issues 827
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 70
    • Merge Requests 70
  • 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
  • !368

Open
Opened 3 days ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/HipsterHedgehog] (feat): only show impressions if the hidden flag doesn't exist

closes #1137 depends on engine!218

Edited 3 days 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.fix.remove-counters-from-faux-activity-posts
git checkout -b eiennohi/front-sprint/HipsterHedgehog.fix.remove-counters-from-faux-activity-posts 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.fix.remove-counters-from-faux-activity-posts

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.fix.remove-counters-from-faux-activity-posts into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67398561 passed for 5906a5d2 on eiennohi:sprint/HipsterHedgehog.fix.remove-counters-from-faux-activity-posts
    Requires approval from Devs. Approved by
    Ben Hayward
    Ben Hayward
    Emiliano Balbuena
    Emiliano Balbuena
    Mark Harding
    Mark Harding
    Martin Santangelo
    Martin Santangelo
    Brian Hatchet
    Brian Hatchet
    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 #1137

    Deletes source branch

    • Discussion 1
    • Commits 1
    • Pipelines 1
    • Changes 1
    0/1 discussion resolved
    • Loading...
    • Marcelo Rivera @eiennohi mentioned in merge request engine!218 3 days ago

      mentioned in merge request engine!218

    • Marcelo Rivera @eiennohi changed the description 3 days ago

      changed the description

    • Ben Hayward @benhayward.ben approved this merge request 3 days ago

      approved this merge request

    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet started a discussion on the diff 35 minutes ago
      src/app/modules/legacy/components/cards/activity/activity.html
      224 224 </a>
      225 225 </div>
      226 226
      227 <div class="impressions-tag m-activity--metrics" [class.m-activity--metrics-wire]="!session.getLoggedInUser() || session.getLoggedInUser().guid != activity.owner_guid" *ngIf="!hideTabs">
      227 <div class="impressions-tag m-activity--metrics" [class.m-activity--metrics-wire]="!session.getLoggedInUser() || session.getLoggedInUser().guid != activity.owner_guid" *ngIf="!activity.hide_impressions && !hideTabs">
      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet · 35 minutes ago
        Maintainer

        This compound statements are getting a little long. It might time for a function.

      Please register or sign in to reply
    • 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
    Emiliano Balbuena
    user avatar
    Mark Harding
    user avatar
    Martin Santangelo
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    user avatar
    Marcelo Rivera
    Reference: minds/front!368