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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 193
    • Issues 193
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 5
    • Merge Requests 5
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !181

Merged
Opened 2 weeks ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

ElasticSearch feeds

Edited 1 week ago by Emiliano Balbuena

Check out, review, and merge locally

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

git fetch https://gitlab.com/edgebal/mobile-native.git goal/es-feeds
git checkout -b edgebal/mobile-native-goal/es-feeds 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 edgebal/mobile-native-goal/es-feeds

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 edgebal:goal/es-feeds into master
  • Email patches
  • Plain diff
Pipeline #60371258 passed for efe75b92 on edgebal:goal/es-feeds
    Requires approval from ms.
    Martin Santangelo
    Martin Santangelo

    Merged by Martin Santangelo 8 minutes ago

    The changes were merged into master with 63fa2dec

    Allows commits from members who can merge to the target branch
    Pipeline #62276314 running for 63fa2dec on master
          • Discussion 0
          • Commits 11
          • Pipelines 11
          • Changes 25
          • Loading...
          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • f8ccf2f8 - (feat): Hide blocked users' comments

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • fa0646f0 - (feat): Hide blocked users' remind content

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • b6eb9f21 - (feat): Blocked channels list on Settings

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 261fb9c6 - (feat): Subscribed feed from ES service

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 0aef2e98 - (feat): Channel feeds from ES

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 8661248c - (feat): Groups feeds to use ES

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • f128a4d6 - (fix): Fix "Can't load" error when scrolling to end of feeds

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 887378ed - (chore): Remove unused response key

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 8ab0787c - (test): Update snapshot

            Compare with previous version

          • Emiliano Balbuena @edgebal unmarked as a Work In Progress 1 week ago

            unmarked as a Work In Progress

          • Emiliano Balbuena @edgebal added 22 commits 1 week ago

            added 22 commits

            • 8ab0787c...88c0f847 - 21 commits from branch minds:master
            • efe75b92 - Merge remote-tracking branch 'upstream/master' into goal/es-feeds

            Compare with previous version

          • Martin Santangelo @msantang78 merged 8 minutes ago

            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
          Assignee
          Emiliano Balbuena's avatar Emiliano Balbuena @edgebal
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          0
          Labels
          None
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          2
          2 participants
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          Reference: minds/mobile-native!181

          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.