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 112
    • Issues 112
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 8
    • Merge Requests 8
  • 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
  • !257

Merged
Opened 23 hours ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/JollyJellyfish] (fix) entities service should return at least local entities if it can't fetch all the page

closes #1066 (closed)

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.fix.discovery.feeds.screen.not.opening.last.page
git checkout -b msantang78/mobile-native-sprint/JollyJellyfish.fix.discovery.feeds.screen.not.opening.last.page 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 msantang78/mobile-native-sprint/JollyJellyfish.fix.discovery.feeds.screen.not.opening.last.page

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 msantang78:sprint/JollyJellyfish.fix.discovery.feeds.screen.not.opening.last.page into master
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
Merge request approved. Approved by
Brian Hatchet
Brian Hatchet

Merged by Martin Santangelo 13 minutes ago

The changes were merged into master with afb0a07b

Closed #1066 (closed)

Pipeline #71919932 canceled for afb0a07b on master
        • Discussion 0
        • Commits 1
        • Pipelines 1
        • Changes 1
        • Loading...
        • Martin Santangelo @msantang78 changed milestone to %sprint: Jolly Jellyfish 23 hours ago

          changed milestone to %sprint: Jolly Jellyfish

        • Martin Santangelo @msantang78 added Squad::Green scoped label 23 hours ago

          added Squad::Green scoped label

        • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 22 hours ago

          approved this merge request

        • Martin Santangelo @msantang78 merged 13 minutes ago

          merged

        • Martin Santangelo @msantang78 mentioned in commit afb0a07b 13 minutes ago

          mentioned in commit afb0a07b

        • 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
        1
        Labels
        Squad::Green
        Assign labels
        • View project labels
        Lock merge request
        Unlocked
        2
        2 participants
        user avatar
        Martin Santangelo
        user avatar
        Brian Hatchet
        Reference: minds/mobile-native!257

        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.