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 815
    • Issues 815
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 73
    • Merge Requests 73
  • 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 1 week 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 (closed)

Edited 1 week 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 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #68796260 failed for bbc2875a on eiennohi:sprint/HipsterHedgehog.fix.remove-counters-from-faux-activity-posts
          Requires 2 more approvals from Devs.
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          Ben Hayward
          Ben Hayward
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          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 2
          • Commits 2
          • Pipelines 2
          • Changes 1
          0/1 discussion resolved
          • Loading...
          • Marcelo Rivera @eiennohi mentioned in merge request engine!218 (closed) 1 week ago

            mentioned in merge request engine!218 (closed)

          • Marcelo Rivera @eiennohi changed the description 1 week ago

            changed the description

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

            approved this merge request

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a discussion on the diff 6 days 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 · 6 days ago
              Maintainer

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

            Please register or sign in to reply
          • Mark Harding @markeharding added MR::Awaiting Review label 5 hours ago

            added MR::Awaiting Review label

          • Marcelo Rivera @eiennohi added 10 commits 4 hours ago

            added 10 commits

            • 5906a5d2...1d9aa9fa - 9 commits from branch minds:master
            • bbc2875a - Merge remote-tracking branch 'upstream/master' into...

            Compare with previous version

          • Marcelo Rivera
            Marcelo Rivera @eiennohi · 2 hours ago
            Developer

            closing in favour of !385

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