Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 120
    • Issues 120
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 17
    • Merge Requests 17
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !273

Open
Opened 5 days ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/JollyJellyfish] (feat) use entities service in activity screen

closes #1124

Check out, review, and merge locally

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

git fetch https://gitlab.com/msantang78/mobile-native.git sprint/JollyJellyfish.feat.integrate.entities-service.single.entitystore.update.activity-screen
git checkout -b msantang78/mobile-native-sprint/JollyJellyfish.feat.integrate.entities-service.single.entitystore.update.activity-screen 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/release/3.8.0
git merge --no-ff msantang78/mobile-native-sprint/JollyJellyfish.feat.integrate.entities-service.single.entitystore.update.activity-screen

Step 4. Push the result of the merge to GitLab

git push origin release/3.8.0

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 msantang78:sprint/JollyJellyfish.feat.integrate.entities-service.single.entitystore.update.activity-screen into release/3.8.0
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
Merge request approved. Approved by
Mark Harding
Mark Harding
Brian Hatchet
Brian Hatchet
Ready to be merged automatically. Ask someone with write access to this repository to merge this request
  • Discussion 2
  • Commits 1
  • Pipelines 1
  • Changes 7
0/1 thread resolved
  • Loading...
  • Martin Santangelo @msantang78 changed milestone to %sprint: Jolly Jellyfish 5 days ago

    changed milestone to %sprint: Jolly Jellyfish

  • Martin Santangelo @msantang78 added Squad::Green scoped label 5 days ago

    added Squad::Green scoped label

  • Martin Santangelo @msantang78 changed target branch from master to v3.8.0-rc2 5 days ago

    changed target branch from master to v3.8.0-rc2

  • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 5 days ago

    approved this merge request

  • Martin Santangelo @msantang78 added MR::Awaiting Review scoped label 4 days ago

    added MR::Awaiting Review scoped label

  • Martin Santangelo @msantang78 changed target branch from v3.8.0-rc2 to release/3.8.0 3 hours ago

    changed target branch from v3.8.0-rc2 to release/3.8.0

  • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 29 minutes ago

    approved this merge request

  • Mark Harding
    Mark Harding @markeharding started a thread on the diff 17 minutes ago
    Last updated by Martin Santangelo 4 minutes ago
    src/newsfeed/ActivityScreen.js
    50 46 this.comments = commentsStoreProvider.get();
    51 47
    52 48 if (params.entity && (params.entity.guid || params.entity.entity_guid)) {
    53 this.entityStore.setEntity(ActivityModel.checkOrCreate(params.entity));
    54 49
    55 const entity = this.entityStore.entity;
    50 const urn = 'urn:entity:' + (params.entity.guid || params.entity.entity_guid);
    • Mark Harding
      Mark Harding @markeharding · 17 minutes ago
      Owner

      should this not be activity?

    • Martin Santangelo
      Martin Santangelo @msantang78 · 4 minutes ago
      Maintainer

      the backend is returning all as urn:entity for mobile, if I recall correctly it was a fix to be compatible with the previous implementation of the es-feeds

    • Please register or sign in to reply
  • Mark Harding @markeharding approved this merge request 17 minutes ago

    approved this merge request

  • 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
sprint: Jolly Jellyfish
Milestone
sprint: Jolly Jellyfish
Assign milestone
None
Time tracking
No estimate or time spent
2
Labels
MR::Awaiting Review Squad::Green
Assign labels
  • View project labels
Lock merge request
Unlocked
3
3 participants
user avatar
Martin Santangelo
user avatar
Mark Harding
user avatar
Brian Hatchet
Reference: minds/mobile-native!273