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 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
  • !272

Merged
Opened 6 days ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/JollyJellyfish] (fix) no subs count on channels

closes #1119

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.no.subs-count.in.channels
git checkout -b msantang78/mobile-native-sprint/JollyJellyfish.fix.no.subs-count.in.channels 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.fix.no.subs-count.in.channels

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.fix.no.subs-count.in.channels into release/3.8.0
  • 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

Merged by Martin Santangelo 16 minutes ago

The changes were merged into release/3.8.0 with 6430f944

Pipeline #73804041 running for 6430f944 on release/3.8.0
          • Discussion 2
          • Commits 3
          • Pipelines 3
          • Changes 7
          0/1 thread resolved
          • Loading...
          • Martin Santangelo @msantang78 changed milestone to %sprint: Jolly Jellyfish 6 days ago

            changed milestone to %sprint: Jolly Jellyfish

          • Martin Santangelo @msantang78 added Squad::Green scoped label 6 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
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 5 days ago
            Last updated by Martin Santangelo 4 days ago
            __tests__/blogs/__snapshots__/BlogsViewScreen.js.snap
            75 75 "getAvatarSource": [MockFunction],
            76 76 "guid": 100,
            77 77 "icontime": "1523515420",
            78 "impressions": undefined,
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 5 days ago
              Maintainer

              Are these supposed to be undefined?

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

              I will add that field to the BlogsFaker

            • Martin Santangelo @msantang78 changed this line in version 4 of the diff 4 days ago

              changed this line in version 4 of the diff

            • Please register or sign in to reply
          • Martin Santangelo @msantang78 added MR::Awaiting Review scoped label 4 days ago

            added MR::Awaiting Review scoped label

          • Martin Santangelo @msantang78 added 1 commit 4 days ago

            added 1 commit

            • b30d2bb3 - (chore) update blogFaker

            Compare with previous version

          • Martin Santangelo @msantang78 added 1 commit 4 days ago

            added 1 commit

            • a742a323 - (chore) fields added to users faker

            Compare with previous version

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

            approved this merge request

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

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

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

            approved this merge request

          • Mark Harding @markeharding approved this merge request 2 hours ago

            approved this merge request

          • Martin Santangelo @msantang78 merged 16 minutes ago

            merged

          • Martin Santangelo @msantang78 mentioned in commit 6430f944 16 minutes ago

            mentioned in commit 6430f944

          • 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!272

          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.