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 213
    • Issues 213
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 34
    • Merge Requests 34
  • 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

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

WIP: (feat): Minds Pro

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/master"
git merge --no-ff "epic/minds-pro"

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 epic/minds-pro into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #82841696 failed for d321c14d on epic/minds-pro
          Requires 3 more approvals from Devs, Deployers, and QA.
          Mark Harding
          Mark Harding
          Ben Hayward
          Ben Hayward
          Rami Albatal
          Rami Albatal
          Brian Hatchet
          Brian Hatchet
          Marcelo Rivera
          Marcelo Rivera
          This is a Work in Progress

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

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 1
          • Commits 69
          • Pipelines 63
          • Changes 51
          0/1 thread resolved
          • Loading...
          • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 2 weeks ago

            added Product::Pro Squad::Yellow scoped labels

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

            assigned to @eiennohi

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

            assigned to @IanCrossland

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

            added MR::Requires Changes scoped label

          • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

            added 1 commit

            • 84866727 - (fix): added comment

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 1 week ago

            added 1 commit

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

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 1 week ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 369171d1 - (wip): SEO

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

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

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 1 week ago

            added 1 commit

            • ae4fcdaf - (feat): SEO

            Compare with previous version

          • Emiliano Balbuena @edgebal added 13 commits 1 week 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 1 week ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 20ec8968 - (cs): fixer

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 06925ad7 - (test): pro spec tests

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 6 days ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 6 days 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 5 days ago

            added 1 commit

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

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 5 days ago

            added 1 commit

            • f036dd03 - (feat): added in new more_transparent_background_color

            Compare with previous version

          • Emiliano Balbuena @edgebal added 14 commits 4 days 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 4 days ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 3 commits 4 days 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 4 days 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 day ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 10 commits 1 day 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 day ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 day 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 day 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 day ago

            added 1 commit

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

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 1 day ago

            added 1 commit

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

            Compare with previous version

          • Marcelo Rivera @eiennohi added 1 commit 16 hours ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 3 commits 12 hours 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 11 hours ago

            added 1 commit

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

            Compare with previous version

          • Emiliano Balbuena @edgebal added 4 commits 10 hours 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 8 hours ago

            added 1 commit

            • 8cffd4c9 - (wip): Spec tests

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 5 hours ago

            added 1 commit

            • d321c14d - (test): Spec tests

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on commit c12f0683 1 hour ago
            Common/Jwt.php
            1 <?php
            2 /**
            3 * Jwt
            4 * @author edgebal
            5 */
            6
            7 namespace Minds\Common;
            8
            9 use Exception;
            10 use Firebase\JWT\JWT as FirebaseJWT;
            • Mark Harding
              Mark Harding @markeharding · 1 hour ago
              Owner

              This is using legacy JWT library. We should be using the new JWT library used by Core/Sessions/Manager, Core/Security/SignedUri.php etc. The new one is the Lcobucci\JWT library

            • Please register or sign in to reply
          • 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
          Mark Harding
          user avatar
          Ben Hayward
          user avatar
          Rami Albatal
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          user avatar
          Martin Santangelo
          user avatar
          Ian Crossland
          Reference: minds/engine!308