Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 222
    • Issues 222
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 41
    • Merge Requests 41
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !347

Our Privacy Policy has changed, please visit https://about.gitlab.com/privacy to review these changes.

Open
Opened 2 hours ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

WIP: [Sprint/OldfashionedOwl](fix): Subscription feed upgrade #435

Closes #435

To test, pick a user with some subscriptions, and visit /{user}/subscriptions

Check out, review, and merge locally

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

git fetch origin
git checkout -b "fix/subscription-feed-435" "origin/fix/subscription-feed-435"

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 "fix/subscription-feed-435"

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 fix/subscription-feed-435 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #84839674 running for 0f12af4c on fix/subscription-feed-435
          Requires 3 more approvals from Devs, Deployers, and QA.
          Rami Albatal
          Rami Albatal
          Martin Santangelo
          Martin Santangelo
          Emiliano Balbuena
          Emiliano Balbuena
          Olivia Madrid
          Olivia Madrid
          Mark Harding
          Mark Harding
          This is a Work in Progress

          Closes #435

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 0
          • Commits 2
          • Pipelines 2
          • Changes 5
          • Loading...
          • Ben Hayward @benhayward.ben added Squad::Yellow scoped label 2 hours ago

            added Squad::Yellow scoped label

          • Ben Hayward @benhayward.ben added 1 commit 20 minutes ago

            added 1 commit

            • 0f12af4c - Updated

            Compare with previous version

          • 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
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          user avatar
          Olivia Madrid
          user avatar
          Mark Harding
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          Reference: minds/engine!347