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 827
    • Issues 827
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 70
    • Merge Requests 70
  • 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
  • !373

Open
Opened 3 hours ago by Mark Harding@markeharding0 of 2 tasks completed0/2 tasks
  • Report abuse
Report abuse

Refactor/es feeds

TODO:

  • Re-introduce block client side
  • Re-synchronise entities in the background

Check out, review, and merge locally

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

git fetch origin
git checkout -b refactor/es-feeds origin/refactor/es-feeds

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 refactor/es-feeds

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 refactor/es-feeds into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67753368 passed for 9dc4d33a on refactor/es-feeds
    Requires 2 more approvals from Devs.
    Emiliano Balbuena
    Emiliano Balbuena
    Ben Hayward
    Ben Hayward
    Martin Santangelo
    Martin Santangelo
    Brian Hatchet
    Brian Hatchet
    Marcelo Rivera
    Marcelo Rivera
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request
    • Discussion 1
    • Commits 3
    • Pipelines 3
    • Changes 12
    0/1 discussion resolved
    • Loading...
    • Mark Harding @markeharding mentioned in merge request engine!221 3 hours ago

      mentioned in merge request engine!221

    • Mark Harding @markeharding added 1 commit 19 minutes ago

      added 1 commit

      • 9dc4d33a - (fix): use combineLatest to ensure obversables are in sync for hasMore

      Compare with previous version

    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet started a discussion on the diff 2 minutes ago
      src/app/modules/channels/sorted/sorted.component.html
      21 21
      22 22 <ng-container *ngIf="['images', 'videos'].indexOf(type) > -1; else entityListView">
      23 23 <m-newsfeed__tiles
      24 [entities]="getAllEntities()"
      24 [entities]="feedsService.feed | async"
      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet · 2 minutes ago
        Maintainer

        Yaaaay! Asyc pipes <3

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