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 216
    • Issues 216
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 38
    • Merge Requests 38
  • 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
  • !308

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

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

(feat): Minds Pro

Edited 5 days ago by Emiliano Balbuena
Request to merge epic/minds-pro into master
  • Email patches
  • Plain diff
Pipeline #84146407 passed for 903c2cc7 on epic/minds-pro
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Marcelo Rivera
          Marcelo Rivera
          Rami Albatal
          Rami Albatal
          Brian Hatchet
          Brian Hatchet
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward

          Merged by Mark Harding 6 minutes ago

          The changes were merged into master with 0070c0aa

          The source branch has been deleted

          Closed #824 (closed), #825 (closed), and #833 (closed)

          Pipeline #84298344 running for 0070c0aa on master
                      • Discussion 43
                      • Commits 79
                      • Pipelines 73
                      • Changes 49
                      40/40 threads resolved
                      • Loading...
                      • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 3 weeks ago

                        added Product::Pro Squad::Yellow scoped labels

                      • Emiliano Balbuena @edgebal assigned to @eiennohi 3 weeks ago

                        assigned to @eiennohi

                      • Emiliano Balbuena @edgebal assigned to @IanCrossland 3 weeks ago

                        assigned to @IanCrossland

                      • Emiliano Balbuena @edgebal added MR::Requires Changes scoped label 3 weeks ago

                        added MR::Requires Changes scoped label

                      • Marcelo Rivera @eiennohi added 1 commit 3 weeks ago

                        added 1 commit

                        • 84866727 - (fix): added comment

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

                        added 1 commit

                        • 195f71d8 - WIP: (feat): pro SEO

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

                        added 1 commit

                        • 29d07b79 - WIP: (feat): pro SEO

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                        added 1 commit

                        • 79f1c4b4 - (fix): Add missing x-version from CORS header

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                        added 1 commit

                        • 369171d1 - (wip): SEO

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                        added 1 commit

                        • acb9a1ac - (fix): Scheme not being set on CORS origin header

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

                        added 1 commit

                        • ae4fcdaf - (feat): SEO

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 13 commits 2 weeks ago

                        added 13 commits

                        • ae4fcdaf...fd67bc47 - 12 commits from branch master
                        • 74fd5f90 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                        added 1 commit

                        • b087d084 - (fix): Missing fallback SEO root for Pro

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                        added 1 commit

                        • 4e58a8d4 - (feat): Get Pro Domain owner icon

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                        added 1 commit

                        • 20ec8968 - (cs): fixer

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                        added 1 commit

                        • 06925ad7 - (test): pro spec tests

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                        added 1 commit

                        • 31683298 - (feat): added default tile ratio for pro settings

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                        added 1 commit

                        • 90466971 - (feat): Allow admins to edit Pro settings; Custom <head> support

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                        added 1 commit

                        • c12f0683 - (feat): XSRF token sync between domains using JWT

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                        added 1 commit

                        • f036dd03 - (feat): added in new more_transparent_background_color

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 14 commits 1 week ago

                        added 14 commits

                        • f036dd03...c736d788 - 13 commits from branch master
                        • a72df16f - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                        added 1 commit

                        • 4afce830 - (feat): add validations to Pro\Settings

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 3 commits 1 week ago

                        added 3 commits

                        • b2141b49 - (chore): Disable self-enable on Pro
                        • 8231b3bf - (chore): Allow admins to toggle Pro
                        • 01c9ba9f - (cs): Code lint

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 2 commits 1 week ago

                        added 2 commits

                        • 884960b7 - (refactor): Return both channel and current user on main pro endpoint
                        • b67c48fc - (cs): code lint

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                        added 1 commit

                        • 53acfc54 - (feat): implement caching layer for homepage content

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 10 commits 1 week ago

                        added 10 commits

                        • 53acfc54...9251d5cf - 8 commits from branch master
                        • faeede82 - (chore): Add Pro entry to feature settings
                        • 5460503c - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                        added 1 commit

                        • 1b600e0b - (fix): Ensure cached content is served correctly

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                        added 1 commit

                        • bf5c71db - (refactor): Cache tag breakdown content instead of top Pro feed

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                        added 1 commit

                        • 754c3a2d - (feat): auto-subscribe on login and signup when on pro standalone

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                        added 1 commit

                        • 53ccb4e5 - (fix): only record subscription if it actually subscribed

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                        added 1 commit

                        • 6b39b7d8 - (feat): moved v2/feeds/channel to v2/pro/content

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                        added 1 commit

                        • 79b26e40 - (fix): correctly save colours & allow empty logo_guid

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 3 commits 1 week ago

                        added 3 commits

                        • d4e1d52e - (wip): Setup routing engine when updating domain
                        • afdf7b0d - (cs): Lint
                        • 9ecaa517 - (feat): Use DynamoDB as Edge Routing

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                        added 1 commit

                        • a5eb0ba3 - (chore): Add missing frontends config to Pro Domain

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 4 commits 1 week ago

                        added 4 commits

                        • a5eb0ba3...91c223dc - 3 commits from branch master
                        • 1a67287a - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                        added 1 commit

                        • 8cffd4c9 - (wip): Spec tests

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                        added 1 commit

                        • d321c14d - (test): Spec tests

                        Compare with previous version

                      • Mark Harding
                        Mark Harding @markeharding started a thread on an outdated change in commit c12f0683 1 week ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                        added 1 commit

                        • 4bfd897d - (cs): lint

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 2 commits 6 days ago

                        added 2 commits

                        • 2b190e32 - (fix): Use the right User instance when logging auto-sub
                        • 4cad42ea - (fix): Auto-subscribe when logging in and signing up

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                        added 1 commit

                        • 0cdeb9cb - (chore): Use a newer JWT package

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                        added 1 commit

                        • 01345412 - (chore): Add custom X-Minds-Pro header at Traefik frontend level

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 8 commits 5 days ago

                        added 8 commits

                        • 01345412...12564482 - 7 commits from branch master
                        • 67487b04 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                        Compare with previous version

                      • Emiliano Balbuena @edgebal unmarked as a Work In Progress 5 days ago

                        unmarked as a Work In Progress

                      • Emiliano Balbuena @edgebal added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label 5 days ago

                        added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label

                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding @markeharding added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 4 days ago

                        added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label

                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Mark Harding
                        Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
                        Resolved by Emiliano Balbuena 4 days ago
                      • Emiliano Balbuena @edgebal mentioned in issue #856 (closed) 4 days ago

                        mentioned in issue #856 (closed)

                      • Emiliano Balbuena @edgebal resolved all threads 4 days ago

                        resolved all threads

                      • Emiliano Balbuena @edgebal added 1 commit 4 days ago

                        added 1 commit

                        • dff97f95 - (chore): Follow up tasks (#856 (closed))

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 2 days ago

                        added 1 commit

                        • e34c30c4 - (feat): Implement referrals to Pro Domains

                        Compare with previous version

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

                        approved this merge request

                      • Marcelo Rivera @eiennohi added 3 commits 15 hours ago

                        added 3 commits

                        • e34c30c4...72c7048d - 2 commits from branch master
                        • 51e545aa - Merge remote-tracking branch 'upstream/master' into epic/minds-pro

                        Compare with previous version

                      • Marcelo Rivera @eiennohi added 1 commit 15 hours ago

                        added 1 commit

                        • 15b78b3c - Merge remote-tracking branch 'upstream/master' into epic/minds-pro

                        Compare with previous version

                      • Emiliano Balbuena @edgebal added 1 commit 14 hours ago

                        added 1 commit

                        • 903c2cc7 - (fix): Avoid double importing Di

                        Compare with previous version

                      • Mark Harding @markeharding approved this merge request 9 minutes ago

                        approved this merge request

                      • Mark Harding @markeharding merged 6 minutes ago

                        merged

                      • Mark Harding @markeharding mentioned in commit 0070c0aa 6 minutes ago

                        mentioned in commit 0070c0aa

                      • 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
                      3 Assignees
                      Emiliano Balbuena's avatar
                      Marcelo Rivera's avatar
                      Ian Crossland's avatar
                      Assign to
                      None
                      Milestone
                      None
                      Assign milestone
                      None
                      Time tracking
                      No estimate or time spent
                      3
                      Labels
                      MR::Requires Changes Product::Pro Squad::Yellow
                      Assign labels
                      • View project labels
                      Lock merge request
                      Unlocked
                      8
                      8 participants
                      user avatar
                      Marcelo Rivera
                      user avatar
                      Rami Albatal
                      user avatar
                      Brian Hatchet
                      user avatar
                      Martin Santangelo
                      user avatar
                      Ben Hayward
                      user avatar
                      Emiliano Balbuena
                      user avatar
                      Ian Crossland
                      Reference: minds/engine!308

                      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.