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 32
    • Merge Requests 32
  • 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
  • !294

Open
Opened 3 weeks 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 4 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #81575145 passed for 8d12f6c7 on epic/post-scheduler
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          This is a Work in Progress
          You can merge this merge request manually using the
          • Discussion 12
          • Commits 22
          • Pipelines 21
          • Changes 22
          9/11 threads resolved
          • Loading...
          • Bill Ottman
            Bill Ottman :dragon_face: @ottman · 3 weeks ago
            Owner

            Excited about this! :)

          • Juan Manuel Solaro @juanmsolaro added 1 commit 3 weeks 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 3 weeks ago
            Resolved by Juan Manuel Solaro 3 weeks ago
          • Juan Manuel Solaro @juanmsolaro added 2 commits 3 weeks 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 3 weeks ago

            resolved all threads

          • Juan Manuel Solaro @juanmsolaro added 1 commit 3 weeks 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 3 weeks ago

            added 1 commit

            • 334bc6d5 - (fix) specs should resolve fine

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 3 weeks 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 3 weeks 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 an old version of the diff 3 weeks ago
            Resolved by Juan Manuel Solaro 2 weeks ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 3 weeks ago
            Resolved by Juan Manuel Solaro 2 weeks ago
          • Juan Manuel Solaro @juanmsolaro added 1 commit 3 weeks ago

            added 1 commit

            • 54fe5e28 - (feat) ability to count scheduled activities

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

            added 1 commit

            • 2042213a - (test) add specs for scheduled manager and repository

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

            added 1 commit

            • 455496ee - (fix) adapt code to reviews

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

            added 1 commit

            • 4fc1c30b - (fix) more than 3 months time created exception should be catched

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

            added 1 commit

            • f762c1f7 - (fix) move scheduled endpoint as per review

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 23 commits 2 weeks ago

            added 23 commits

            • f762c1f7...8e6942b6 - 22 commits from branch master
            • 34c8b96b - (fix) merge master into branch

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

            added 1 commit

            • 5cf6c80a - (fix) lint fixes

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro resolved all threads 2 weeks ago

            resolved all threads

          • Juan Manuel Solaro @juanmsolaro resolved all threads 2 weeks ago

            resolved all threads

          • Juan Manuel Solaro @juanmsolaro added 7 commits 2 weeks ago

            added 7 commits

            • 5cf6c80a...514184e4 - 6 commits from branch master
            • 2bda8429 - Merge branch 'master' into epic/post-scheduler

            Compare with previous version

          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on the diff 1 week ago
            Resolved by Mark Harding 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on the diff 1 week ago
            Controllers/api/v1/blog.php
            300 $timeCreatedDelegate->onUpdate($blog, $_POST['time_created'], time());
            301 } else {
            302 $timeCreatedDelegate->onAdd($blog, $_POST['time_created'], time());
            303 }
            304 } catch (\Exception $e) {
            305 return Factory::response([
            306 'status' => 'error',
            307 'message' => $e->getMessage(),
            308 ]);
            309 }
            310 }
            311
            312 if (!$blog->isPublished()) {
            313 $blog->setAccessId(Access::UNLISTED);
            314 $blog->setDraftAccessId($_POST['access_id']);
            315 } elseif ($blog->getTimePublished() == '') {
            • Marcelo Rivera
              Marcelo Rivera @eiennohi · 1 week ago
              Developer

              Wouldn't it be cleaner to do !$blog->getTimePublished()?

            • Please register or sign in to reply
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 week ago
            Resolved by Juan Manuel Solaro 1 week ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on the diff 1 week ago
            Controllers/api/v2/feeds/scheduled.php
            32 'status' => 'error',
            33 'message' => 'Invalid container',
            34 ]);
            35 }
            36
            37 $container = EntitiesFactory::build($container_guid);
            38
            39 if (!$container || !Core\Security\ACL::_()->read($container, $currentUser)) {
            40 return Factory::response([
            41 'status' => 'error',
            42 'message' => 'Forbidden',
            43 ]);
            44 }
            45
            46 $type = '';
            47 switch ($pages[1]) {
            • Marcelo Rivera
              Marcelo Rivera @eiennohi · 1 week ago
              Developer

              we could add a default case that throws a incorrect type exception, or something like that

            • Please register or sign in to reply
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 week ago
            Resolved by Juan Manuel Solaro 1 week ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 week ago
            Resolved by Juan Manuel Solaro 1 week ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 week ago
            Resolved by Juan Manuel Solaro 1 week ago
          • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

            added 1 commit

            • 63c28906 - (feat) add filter by scheduled for entities resolver and adapt code as per review

            Compare with previous version

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

            added 1 commit

            • a9126588 - (fix) apply lint fixes

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 2 commits 2 days ago

            added 2 commits

            • e20df67c - (fix) change repository filter from time_created to timestamp and fix resolver filter
            • 4499d84d - (fix) apply fixer changes

            Compare with previous version

          • Juan Manuel Solaro @juanmsolaro added 20 commits 1 day ago

            added 20 commits

            • 4499d84d...14f32dc5 - 19 commits from branch master
            • 77e9ee55 - merge master into branch

            Compare with previous version

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

            added 1 commit

            • 8d12f6c7 - (fix): if editing, time_created should only be changed if it's different from entity time_created

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 1 hour ago
            Resolved by Mark Harding 1 hour ago
          • Mark Harding @markeharding approved this merge request 1 hour ago

            approved this merge request

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