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 824
    • Issues 824
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 44
    • Merge Requests 44
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • 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
  • !89

Closed
Opened 6 months ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/MindsOne] (feat): add tags preview to blog tiles

closes #124

normal user:

image

admin (the snowflake appears):

image

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/MindsOne.feat.add-tags-preview-to-blog-tiles
git checkout -b eiennohi/front-sprint/MindsOne.feat.add-tags-preview-to-blog-tiles 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/MindsOne.feat.add-tags-preview-to-blog-tiles

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/MindsOne.feat.add-tags-preview-to-blog-tiles into master
  • Email patches
  • Plain diff
Pipeline #44496101 passed for 397f4d5a on eiennohi:sprint/MindsOne.feat.add-tags-preview-to-blog-tiles
    Requires 2 more approvals from Devs and Deployers.
    Mark Harding
    Mark Harding
    Brian Hatchet
    Brian Hatchet
    Martin Santangelo
    Martin Santangelo
    Emiliano Balbuena
    Emiliano Balbuena
    Ben Hayward
    Ben Hayward

    Closed by Mark Harding 8 minutes ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close #124

    Deletes source branch

    • Discussion 0
    • Commits 4
    • Pipelines 2
    • Changes 7
    • Loading...
    • Marcelo Rivera @eiennohi added 129 commits 5 months ago

      added 129 commits

      • 4959be12...bad0bb7a - 127 commits from branch minds:master
      • 02e6f22b - Merge remote-tracking branch 'upstream/master' into...
      • 397f4d5a - (fix): spec tests

      Compare with previous version

    • Mark Harding @markeharding closed 8 minutes ago

      closed

    • 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
    0 Assignees
    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
    Brian Hatchet
    user avatar
    Martin Santangelo
    user avatar
    Emiliano Balbuena
    user avatar
    Ben Hayward
    user avatar
    Marcelo Rivera
    Reference: minds/front!89