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 219
    • Issues 219
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 29
    • Merge Requests 29
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • 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
  • !292

Merged
Opened 1 week ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: (feat): Minds Pro (development branch) - Release 2

Check out, review, and merge locally

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

git fetch origin
git checkout -b epic/minds-pro origin/epic/minds-pro

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/minds-pro-stable
git merge --no-ff epic/minds-pro

Step 4. Push the result of the merge to GitLab

git push origin minds-pro-stable

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 epic/minds-pro into minds-pro-stable
  • Email patches
  • Plain diff
Pipeline #77152568 passed for 76af6b01 on epic/minds-pro
          Requires 2 more approvals from Devs and Deployers.
          Brian Hatchet
          Brian Hatchet
          Ben Hayward
          Ben Hayward
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal

          Merged by Emiliano Balbuena 2 minutes ago

          The changes were merged into minds-pro-stable with 76af6b01

          Pipeline #77407428 running for 76af6b01 on minds-pro-stable
                  • Discussion 0
                  • Commits 16
                  • Pipelines 7
                  • Changes 24
                  • Loading...
                  • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 1 week ago

                    added Product::Pro Squad::Yellow scoped labels

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • e45b6a7c - (feat): Featured content entities

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 218a2fe9 - (feat): support filtering by hashtags

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • b8d55a17 - (feat): Pro homepage content aggregator

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • f62228be - (feat): Pro users to have up to 12 pinned posts

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 4 days ago

                    added 1 commit

                    • 68c78916 - (wip): Pro standalone mode

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 2 days ago

                    added 1 commit

                    • a045a6c7 - (feat): Pro Channel homepage categories endpoint

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 10 commits 1 day ago

                    added 10 commits

                    • d14ac69a - (chore): change boost existing check to include approved too
                    • e0140852 - (revert): d14ac69a -> also includes revoked and completed"
                    • 3b7aafa9 - (chore): reduce boost offset to 2.5 minutes
                    • c5d27f85 - (fix): comment on reminds should not go to remind_object
                    • 9bd4d314 - (fix): correct labels for gitlab runners
                    • b7133f81 - (fix): support for boost feed
                    • 37f3f45b - (chore): limit the offset to a single batch
                    • 5a1ef698 - (chore): Bot prevention in phone number
                    • f0a2ec8a - (chore): log all 2fa SMS messages
                    • 76af6b01 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                    Compare with previous version

                    Toggle commit list
                  • Emiliano Balbuena @edgebal merged 2 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
                  2
                  Labels
                  Product::Pro Squad::Yellow
                  Assign labels
                  • View project labels
                  Lock merge request
                  Unlocked
                  7
                  7 participants
                  user avatar
                  Brian Hatchet
                  user avatar
                  Ben Hayward
                  user avatar
                  Martin Santangelo
                  user avatar
                  Mark Harding
                  user avatar
                  Rami Albatal
                  user avatar
                  Marcelo Rivera
                  user avatar
                  Emiliano Balbuena
                  Reference: minds/engine!292

                  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.