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 60
    • Merge Requests 60
  • 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
  • !326

Open
Opened 2 weeks ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/FunnyFrog] (feat): bring back boostfeed

closes #1368

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/FunnyFrog.feat.bring-back-boostfeed
git checkout -b eiennohi/front-sprint/FunnyFrog.feat.bring-back-boostfeed 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/FunnyFrog.feat.bring-back-boostfeed

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/FunnyFrog.feat.bring-back-boostfeed into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67031558 passed for b3d321e1 on eiennohi:sprint/FunnyFrog.feat.bring-back-boostfeed
    Requires 2 more approvals from Devs.
    Brian Hatchet
    Brian Hatchet
    Emiliano Balbuena
    Emiliano Balbuena
    Martin Santangelo
    Martin Santangelo
    Mark Harding
    Mark Harding
    Ben Hayward
    Ben Hayward
    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 #1368

    Deletes source branch

    • Discussion 2
    • Commits 5
    • Pipelines 5
    • Changes 5
    0/1 discussion resolved
    • Loading...
    • Mark Harding
      Mark Harding @markeharding · 11 hours ago
      Owner

      Some major styling issues here. Screen_Shot_2019-06-19_at_10.27.54_AM

      Also, can you keep the poster field and copy what we do with search result, but replace with "Showing boosts". Screen_Shot_2019-06-19_at_10.28.16_AM

    • Marcelo Rivera @eiennohi added 1 commit 6 hours ago

      added 1 commit

      • bda99d36 - (fix): styling fixes

      Compare with previous version

    • Marcelo Rivera @eiennohi added 58 commits 5 hours ago

      added 58 commits

      • bda99d36...f6915ada - 57 commits from branch minds:master
      • cd50e4ae - Merge remote-tracking branch 'upstream/master' into sprint/FunnyFrog.feat.bring-back-boostfeed

      Compare with previous version

    • Marcelo Rivera @eiennohi added 1 commit 4 hours ago

      added 1 commit

      • 2fcffa86 - (fix): spec tests

      Compare with previous version

    • Marcelo Rivera @eiennohi added 1 commit 3 hours ago

      added 1 commit

      • b3d321e1 - (fix): added poster and text saying "Showing boosts"

      Compare with previous version

    • Emiliano Balbuena
      Emiliano Balbuena @edgebal started a discussion on the diff 2 hours ago
      src/app/modules/newsfeed/feeds/boost.component.ts
      70 73 this.paramsSubscription.unsubscribe();
      71 74 }
      72 75
      73 load(refresh: boolean = false) {
      76 async load(refresh: boolean = false) {
      77 if (this.featuresService.has('es-feeds')) {
      78 return await this.loadFromService(refresh);
      79 } else {
      80 return await this.loadLegacy(refresh);
      81 }
      82 }
      83
      84 async loadFromService(refresh: boolean = false) {
      • Emiliano Balbuena
        Emiliano Balbuena @edgebal · 2 hours ago
        Developer

        I think we should only use the legacy load() method here. The BoostedContent service relies on the /v2 endpoint which has limited functionality regarding offsetting. cc/ @markeharding

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