Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 150
    • Issues 150
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 45
    • Merge Requests 45
  • 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 Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !221

Merged
Opened 2 weeks ago by Mark Harding@markeharding
  • Report abuse
Report abuse

(refactor): support hydrating the first batch of entities

Backend changes for front!373 (merged)

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
  • Email patches
  • Plain diff
Pipeline #70444247 passed for 8acd53bf on refactor/es-feeds
          Requires 2 more approvals from Devs.
          Martin Santangelo
          Martin Santangelo
          Brian Hatchet
          Brian Hatchet
          Ben Hayward
          Ben Hayward
          Emiliano Balbuena
          Emiliano Balbuena
          Marcelo Rivera
          Marcelo Rivera

          Merged by Mark Harding 14 minutes ago

          The changes were merged into master with 2b7a7452

          Pipeline #70445543 passed for 2b7a7452 on master
                  • Discussion 1
                  • Commits 6
                  • Pipelines 5
                  • Changes 16
                  • Loading...
                  • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 weeks ago

                    approved this merge request

                  • Brian Hatchet :speech_balloon: @brianhatchet unapproved this merge request 2 weeks ago

                    unapproved this merge request

                  • Brian Hatchet
                    Brian Hatchet :speech_balloon: @brianhatchet · 2 weeks ago
                    Maintainer

                    Failing tests, but otherwise looks good.

                  • Brian Hatchet :speech_balloon: @brianhatchet mentioned in merge request front!373 (merged) 2 weeks ago

                    mentioned in merge request front!373 (merged)

                  • Mark Harding @markeharding added MR::Awaiting Review label 1 week ago

                    added MR::Awaiting Review label

                  • Mark Harding @markeharding added 46 commits 1 day ago

                    added 46 commits

                    • a37378d3...1674767b - 44 commits from branch master
                    • a62c69a6 - Merge branch 'master' of gitlab.com:minds/engine into refactor/es-feeds
                    • 86cf2577 - (feat): feed fixes including pinned posts for containers

                    Compare with previous version

                  • Mark Harding @markeharding added 1 commit 1 day ago

                    added 1 commit

                    • 1a53b79f - (fix): failing spec tests

                    Compare with previous version

                  • Mark Harding @markeharding added 1 commit 1 day ago

                    added 1 commit

                    • c920f910 - (fix): if no hydrated entities don't return entities

                    Compare with previous version

                  • Mark Harding @markeharding added 1 commit 21 minutes ago

                    added 1 commit

                    • 8acd53bf - (chore): If mobile app then return generic urn

                    Compare with previous version

                  • Mark Harding @markeharding merged 14 minutes ago

                    merged

                  • 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
                  1
                  Labels
                  MR::Awaiting Review
                  Assign labels
                  • View project labels
                  Lock merge request
                  Unlocked
                  7
                  7 participants
                  user avatar
                  Martin Santangelo
                  user avatar
                  Brian Hatchet
                  user avatar
                  Ben Hayward
                  user avatar
                  Emiliano Balbuena
                  user avatar
                  Marcelo Rivera
                  user avatar
                  Rami Albatal
                  user avatar
                  Mark Harding
                  Reference: minds/engine!221

                  Revert this merge request

                  This will create a new commit in order to revert the existing changes.

                  Switch branch
                  Cancel
                  A new branch will be created in your fork and a new merge request will be started.

                  Cherry-pick this merge request

                  Switch branch
                  Cancel
                  A new branch will be created in your fork and a new merge request will be started.