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 30
    • Merge Requests 30
  • 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
  • !291

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

WIP: Minds Pro (stable branch)

Check out, review, and merge locally

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

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

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 minds-pro-stable

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 minds-pro-stable into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #77407428 passed for 76af6b01 on minds-pro-stable
          Requires 2 more approvals from Devs and Deployers.
          Brian Hatchet
          Brian Hatchet
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Ben Hayward
          Ben Hayward
          This is a Work in Progress

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 3
          • Commits 24
          • Pipelines 3
          • Changes 28
          0/3 threads 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 added 2 commits 1 week ago

            added 2 commits

            • 3c6712f0 - (feat): Tag list for Pro
            • 05d2acc9 - (feat): Scheme settings

            Compare with previous version

          • Emiliano Balbuena @edgebal added 16 commits 13 hours ago

            added 16 commits

            • 05d2acc9...f0a2ec8a - 9 commits from branch master
            • e45b6a7c - (feat): Featured content entities
            • 218a2fe9 - (feat): support filtering by hashtags
            • b8d55a17 - (feat): Pro homepage content aggregator
            • f62228be - (feat): Pro users to have up to 12 pinned posts
            • 68c78916 - (wip): Pro standalone mode
            • a045a6c7 - (feat): Pro Channel homepage categories endpoint
            • 76af6b01 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

            Compare with previous version

            Toggle commit list
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 7 minutes ago
            Api/Factory.php
            78 80 */
            79 81 public static function pamCheck($request, $response)
            80 82 {
            81 if ( $request->getAttribute('oauth_user_id')
            82 || Security\XSRF::validateRequest()
            83 /** @var Domain $proDomain */
            84 $proDomain = Di::_()->get('Pro\Domain');
            85
            86 if (
            87 $request->getAttribute('oauth_user_id') ||
            88 Security\XSRF::validateRequest() ||
            89 $proDomain->validateRequest($request)
            • Mark Harding
              Mark Harding @markeharding · 7 minutes ago
              Owner

              can we move this to the next possible elseif block to detach from existing flow?

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 5 minutes ago
            Controllers/api/v2/feeds/channel.php
            2 /**
            3 * @author: eiennohi.
            4 */
            5
            6 namespace Minds\Controllers\api\v2\feeds;
            7
            8 use Minds\Api\Exportable;
            9 use Minds\Api\Factory;
            10 use Minds\Common\Repository\Response;
            11 use Minds\Core;
            12 use Minds\Core\Di\Di;
            13 use Minds\Entities\Factory as EntitiesFactory;
            14 use Minds\Entities\User;
            15 use Minds\Interfaces;
            16
            17 class channel implements Interfaces\Api
            • Mark Harding
              Mark Harding @markeharding · 5 minutes ago
              Owner

              why do we have this when we could use api/v2/feeds/container/...?

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 3 minutes ago
            Core/Feeds/Top/Repository.php
            338 349
            339 350 //
            340 351
            352 $esType = $opts['type'];
            353
            354 if ($esType === 'all') {
            355 $esType = 'object:image,object:video,object:blog';
            • Mark Harding
              Mark Harding @markeharding · 3 minutes ago
              Owner

              activity?

            • 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
          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
          Martin Santangelo
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Ben Hayward
          user avatar
          Marcelo Rivera
          user avatar
          Emiliano Balbuena
          Reference: minds/engine!291