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

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

Open
Opened 5 hours ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: (feat): Modernize Router (&75)

Edited 5 hours ago by Emiliano Balbuena

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/modern-router" "origin/epic/modern-router"

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/modern-router"

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/modern-router into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #84268393 passed for 3fc05260 on epic/modern-router
          Requires 2 more approvals from Devs and Deployers.
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 1
          • Commits 1
          • Pipelines 1
          • Changes 7
          0/1 thread resolved
          • Loading...
          • Emiliano Balbuena @edgebal added MR::Requires Changes Sprint::09/25 - Oldfashioned Owl scoped labels 5 hours ago

            added MR::Requires Changes Sprint::09/25 - Oldfashioned Owl scoped labels

          • Emiliano Balbuena @edgebal changed title from WIP: (feat): Modernize Router to WIP: (feat): Modernize Router{+ (&75)+} 5 hours ago

            changed title from WIP: (feat): Modernize Router to WIP: (feat): Modernize Router{+ (&75)+}

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 39 minutes ago
            Core/Router.php
            77 http_response_code($response->getStatusCode());
            78 echo $response->getBody();
            79 }
            80
            81 /**
            82 * Legacy Route the pages
            41 83 * (fallback to elgg page handler if we fail).
            42 84 *
            43 85 * @param string $uri
            44 86 * @param string $method
            45 87 *
            46 88 * @return null|mixed
            89 * @deprecated
            47 90 */
            48 public function route($uri = null, $method = null)
            91 public function legacyHandler($uri = null, $method = null)
            • Mark Harding
              Mark Harding @markeharding · 39 minutes ago
              Owner

              legacy legacy... :smirk: perhaps we can call this prePsr7RouteHandler?

            • 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
          MR::Requires Changes Sprint::09/25 - Oldfashioned Owl
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Rami Albatal
          user avatar
          Emiliano Balbuena
          Reference: minds/engine!342