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 828
    • Issues 828
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 71
    • Merge Requests 71
  • 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
  • !367

Open
Opened 5 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/HipsterHedgehog](feat): Added in badge for onchain boosters

Closes engine#530

image image

Note I've moved the badge component, as there are too many badges to fit in that small space.

Edited 1 day ago by Brian Hatchet

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git onchain-boost-front-changes
git checkout -b benhayward.ben/front-onchain-boost-front-changes 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 benhayward.ben/front-onchain-boost-front-changes

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 benhayward.ben:onchain-boost-front-changes into master
The source branch is 11 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67238286 passed for e0d8af69 on benhayward.ben:onchain-boost-front-changes
    Requires approval from Devs. Approved by
    Brian Hatchet
    Brian Hatchet
    Mark Harding
    Mark Harding
    Martin Santangelo
    Martin Santangelo
    Emiliano Balbuena
    Emiliano Balbuena
    Marcelo Rivera
    Marcelo Rivera
    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 engine#530

    Deletes source branch

    • Discussion 2
    • Commits 3
    • Pipelines 3
    • Changes 4
    0/2 discussions resolved
    • Loading...
    • Ben Hayward @benhayward.ben added 1 commit 5 days ago

      added 1 commit

      • 18c69c19 - Updated so badges do not overflow

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 5 days ago

      added 1 commit

      • e0d8af69 - missed development artifact.

      Compare with previous version

    • Brian Hatchet :speech_balloon: @brianhatchet changed title from Sprint/HipsterHedgehog: Added in bage for onchain boosters to Sprint/HipsterHedgehog: Added in badge for onchain boosters 1 day ago

      changed title from Sprint/HipsterHedgehog: Added in bage for onchain boosters to Sprint/HipsterHedgehog: Added in badge for onchain boosters

    • Brian Hatchet :speech_balloon: @brianhatchet changed the description 1 day ago

      changed the description

    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 1 day ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 2 hours ago
      src/app/common/components/badges/badges.component.html
      23 23 </m-tooltip>
      24 24 </li>
      25 25
      26 <li *ngIf="user.onchain_booster && user.onchain_booster * 1000 > getDate() && badges.indexOf('onchain_booster') > -1">
      • Mark Harding
        Mark Harding @markeharding · 2 hours ago
        Owner

        This is too much logic for an inline check. Can you move to a function?

      Please register or sign in to reply
    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 2 hours ago
      src/app/common/components/badges/badges.component.html
      23 23 </m-tooltip>
      24 24 </li>
      25 25
      26 <li *ngIf="user.onchain_booster && user.onchain_booster * 1000 > getDate() && badges.indexOf('onchain_booster') > -1">
      27 <m-tooltip icon="whatshot" [iconClass]="{'selected': user.founder}" i18n="Founder as user status@@COMMON__BADGES__FOUNDER">
      • Mark Harding
        Mark Harding @markeharding · 2 hours ago
        Owner

        can you use 'link' icon instead?

      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
    Mark Harding
    user avatar
    Martin Santangelo
    user avatar
    Emiliano Balbuena
    user avatar
    Marcelo Rivera
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    Reference: minds/front!367