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
  • !294

Open
Opened 5 days ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

WIP: epic/post-scheduler

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/post-scheduler origin/epic/post-scheduler

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/post-scheduler

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/post-scheduler into master
The source branch is 5 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #77400177 passed for d73a5a51 on epic/post-scheduler
          Requires 2 more approvals from Devs and Deployers.
          Brian Hatchet
          Brian Hatchet
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Emiliano Balbuena
          Emiliano Balbuena
          This is a Work in Progress
          You can merge this merge request manually using the
          • Discussion 4
          • Commits 8
          • Pipelines 7
          • Changes 14
          1/3 threads resolved
          • Loading...
          • Bill Ottman
            Bill Ottman :dragon_face: @ottman · 5 days ago
            Owner

            Excited about this! :)

          • Juan Manuel Solaro @juanmsolaro added 1 commit 4 days ago

            added 1 commit

            • 478bdc45 - (feat) blog linked activities should inherit time_created

            Compare with previous version

          • Emiliano Balbuena
            Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
            Resolved by Juan Manuel Solaro 4 days ago
          • Juan Manuel Solaro @juanmsolaro added 2 commits 4 days ago

            added 2 commits

            • cd5134ab - (feat) children activity inherit time created form parent
            • ba39424c - (fix) fix typos

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro resolved all threads 4 days ago

            resolved all threads

          • Juan Manuel Solaro @juanmsolaro added 1 commit 1 day ago

            added 1 commit

            • b9e36ab7 - (feat) top feeds should be filter by created time

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 1 day ago

            added 1 commit

            • 334bc6d5 - (fix) specs should resolve fine

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 1 day ago

            added 1 commit

            • adc64ef1 - (fix) change spec it_should_not_save_when_previous_activity to...

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 13 hours ago

            added 1 commit

            • d73a5a51 - (feat) filter activities by time_created to get scheduled

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 5 minutes ago
            Controllers/api/v2/channel/scheduled.php
            1 <?php
            • Mark Harding
              Mark Harding @markeharding · 5 minutes ago
              Owner

              this endpoint feels like its in the wrong place. All of the other feeds reside in api/v2/feeds

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 4 minutes ago
            Controllers/api/v1/blog.php
            295 288 }
            296 289 }
            297 290
            291
            292 if (isset($_POST['time_created'])) {
            293 $timeCreatedDelegate = new Core\Feeds\Activity\Delegates\TimeCreatedDelegate();
            • Mark Harding
              Mark Harding @markeharding · 4 minutes ago
              Owner

              When in the blogs context, I don't think we should be calling foreign delegates. This looks more like a manager/event use case

            • 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
          0 Assignees
          None
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          0
          Labels
          None
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          9
          9 participants
          user avatar
          Brian Hatchet
          user avatar
          Martin Santangelo
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          user avatar
          Marcelo Rivera
          Reference: minds/engine!294