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 108
    • Issues 108
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 9
    • Merge Requests 9
  • 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
  • !264

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

[Sprint/JollyJellyfish] (feat) offline cache for comments and conversations

closes #1111 (closed) closes #1102 (closed) closes #1101 (closed) closes #1103 (closed)

Edited 1 hour ago by Martin Santangelo

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.offline-cache.comments
git checkout -b msantang78/mobile-native-sprint/JollyJellyfish.feat.offline-cache.comments 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.feat.offline-cache.comments

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.feat.offline-cache.comments into master
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
Merge request approved. Approved by
Emiliano Balbuena
Emiliano Balbuena
Brian Hatchet
Brian Hatchet

Merged by Martin Santangelo 38 minutes ago

The changes were merged into master with 82cdb6e8

Closed #1101 (closed), #1102 (closed), #1103 (closed), and #1111 (closed)

Pipeline #72522152 running for 82cdb6e8 on master
        • Discussion 0
        • Commits 1
        • Pipelines 1
        • Changes 6
        • Loading...
        • Martin Santangelo @msantang78 changed milestone to %sprint: Jolly Jellyfish 19 hours ago

          changed milestone to %sprint: Jolly Jellyfish

        • Martin Santangelo @msantang78 changed the description 1 hour ago

          changed the description

        • Martin Santangelo @msantang78 added Squad::Green scoped label 1 hour ago

          added Squad::Green scoped label

        • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 1 hour ago

          approved this merge request

        • Emiliano Balbuena @edgebal approved this merge request 58 minutes ago

          approved this merge request

        • Martin Santangelo @msantang78 merged 38 minutes ago

          merged

        • Martin Santangelo @msantang78 mentioned in commit 82cdb6e8 38 minutes ago

          mentioned in commit 82cdb6e8

        • 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
        3
        3 participants
        user avatar
        Martin Santangelo
        user avatar
        Emiliano Balbuena
        user avatar
        Brian Hatchet
        Reference: minds/mobile-native!264

        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.