Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 188
    • Issues 188
    • 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
  • !286

Merged
Opened 3 weeks ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/KiltedKoala] (chore) clean up es-feed conditionals

closes #1145

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/cleanup-es-feeds-conditionals origin/feat/cleanup-es-feeds-conditionals

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.9.0
git merge --no-ff feat/cleanup-es-feeds-conditionals

Step 4. Push the result of the merge to GitLab

git push origin release/3.9.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 feat/cleanup-es-feeds-conditionals into release/3.9.0
  • 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 just now

The changes were merged into release/3.9.0 with a7344132

Pipeline #77885655 running for a7344132 on release/3.9.0
          • Discussion 1
          • Commits 2
          • Pipelines 2
          • Changes 7
          • Loading...
          • Martin Santangelo @msantang78 changed milestone to %sprint: Kilted Koala 3 weeks ago

            changed milestone to %sprint: Kilted Koala

          • Martin Santangelo @msantang78 added Squad::Green scoped label 3 weeks ago

            added Squad::Green scoped label

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

            Merge conflicts need to be resolved

          • Martin Santangelo @msantang78 added 23 commits 2 weeks ago

            added 23 commits

            • 93248111...afcf26d5 - 22 commits from branch release/3.9.0
            • 821bdfc3 - Merge branch 'release/3.9.0' into feat/cleanup-es-feeds-conditionals

            Compare with previous version

          • Martin Santangelo @msantang78 added MR::Awaiting Review scoped label 2 weeks ago

            added MR::Awaiting Review scoped label

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

            approved this merge request

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

            approved this merge request

          • Martin Santangelo @msantang78 mentioned in commit a7344132 1 minute ago

            mentioned in commit a7344132

          • Martin Santangelo @msantang78 merged just now

            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
          sprint: Kilted Koala
          Milestone
          sprint: Kilted Koala
          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
          Emiliano Balbuena
          user avatar
          Brian Hatchet
          Reference: minds/mobile-native!286

          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.