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 826
    • Issues 826
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 69
    • Merge Requests 69
  • 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
  • !375

Open
Opened 50 minutes ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/HipsterHedgehog] (feat): clicks on etag blur should propagate to remind and viceversa

closes #1444

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.feat.click-on-etag-blur-should-propagate-to-remind-and-viceversa
git checkout -b eiennohi/front-sprint/HipsterHedgehog.feat.click-on-etag-blur-should-propagate-to-remind-and-viceversa 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.feat.click-on-etag-blur-should-propagate-to-remind-and-viceversa

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.feat.click-on-etag-blur-should-propagate-to-remind-and-viceversa into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67738993 passed for 10c65c2c on eiennohi:sprint/HipsterHedgehog.feat.click-on-etag-blur-should-propagate-to-remind-and-viceversa
    Requires approval from Devs. Approved by
    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 #1444

    Deletes source branch

    • Discussion 1
    • Commits 1
    • Pipelines 1
    • Changes 4
    0/1 discussion resolved
    • Loading...
    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet started a discussion on the diff 7 minutes ago
      src/app/modules/legacy/components/cards/activity/activity.html
      61 61
      62 62 <div m-read-more class="mdl-card__supporting-text message m-mature-message" [class.m-activity--message-remind]="activity.remind_object"
      63 63 [hidden]="!activity.message || editing">
      64 <a class="m-mature-text-toggle" (click)="activity.mature_visibility = !activity.mature_visibility"
      64 <a class="m-mature-text-toggle" (click)="toggleMatureVisibility()"
      65 65 *ngIf="attachment.shouldBeBlurred(activity) || attachment.isForcefullyShown(activity)"
      66 66 [ngClass]="{ 'mdl-color-text--red-500': attachment.isForcefullyShown(activity) }">
      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet · 7 minutes ago
        Maintainer

        Looks like this already exists, so this isn't a required change, just a question.

        What the hell is "isForcefullyShown()"?

      Please register or sign in to reply
    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 5 minutes 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
    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
    Ben Hayward
    user avatar
    Mark Harding
    user avatar
    Martin Santangelo
    user avatar
    Brian Hatchet
    user avatar
    Marcelo Rivera
    Reference: minds/front!375