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 195
    • Issues 195
    • 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
  • !341

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

Open
Opened 19 hours ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/NuancedNumbat](fix): Null paging token #866

Closes #866 (closed)

Edited 17 hours ago by Ben Hayward

Check out, review, and merge locally

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

git fetch origin
git checkout -b "fix/null-paging-token-866" "origin/fix/null-paging-token-866"

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 "fix/null-paging-token-866"

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 fix/null-paging-token-866 into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #84155872 passed for b24ce746 on fix/null-paging-token-866
          Requires 2 more approvals from Devs and Deployers.
          Emiliano Balbuena
          Emiliano Balbuena
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #866 (closed)

          Deletes source branch

          • Discussion 1
          • Commits 2
          • Pipelines 2
          • Changes 1
          0/1 thread resolved
          • Loading...
          • Ben Hayward @benhayward.ben added Squad::Yellow scoped label 19 hours ago

            added Squad::Yellow scoped label

          • Ben Hayward @benhayward.ben added 1 commit 18 hours ago

            added 1 commit

            • b24ce746 - Returning null for null paging token

            Compare with previous version

          • Ben Hayward @benhayward.ben unmarked as a Work In Progress 17 hours ago

            unmarked as a Work In Progress

          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label 17 hours ago

            added MR::Awaiting Review scoped label

          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on the diff 9 minutes ago
            Core/Rewards/Contributions/Repository.php
            118 118
            119 119 $contributions[] = $contribution;
            120 120 }
            121
            121 $pagingStateToken = $rows->pagingStateToken() ?: null;
            • Marcelo Rivera
              Marcelo Rivera @eiennohi · 9 minutes ago
              Developer

              The error was that $rows was a boolean, so this line should be: $pagingStateToken = $rows ? $rows->pagingStateToken() : null;

            • 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
          2
          Labels
          MR::Awaiting Review Squad::Yellow
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Rami Albatal
          user avatar
          Ben Hayward
          Reference: minds/engine!341