Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 194
    • Issues 194
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 27
    • Merge Requests 27
  • 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
  • !279

Open
Opened 1 week ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/JollyJellyfish](feat): Added plus tiers to endpoint and passed through #578

Depends on front!460

Edited 1 week 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 feat/plus-tiers-578 origin/feat/plus-tiers-578

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 feat/plus-tiers-578

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

          Mentions #578

          Deletes source branch

          • Discussion 7
          • Commits 14
          • Pipelines 12
          • Changes 5
          5/6 threads resolved
          • Loading...
          • Ben Hayward @benhayward.ben added 1 commit 1 week ago

            added 1 commit

            • 8ec1fcb2 - Updated to add spec tests

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 week ago

            added 1 commit

            • 4bbbf6eb - formatting

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 1 week ago

            added 1 commit

            • 5f801ecc - test update

            Compare with previous version

          • Ben Hayward @benhayward.ben unmarked as a Work In Progress 1 week ago

            unmarked as a Work In Progress

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 week ago
            Resolved by Ben Hayward 1 week ago
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 1 week ago
            Resolved by Ben Hayward 1 week ago
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 week ago
            Resolved by Ben Hayward 1 week ago
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 1 week ago
            Resolved by Ben Hayward 1 week ago
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 1 week ago
            Resolved by Ben Hayward 1 week ago
          • Ben Hayward @benhayward.ben changed the description 1 week ago

            changed the description

            • Ben Hayward
              Ben Hayward @benhayward.ben · 1 week ago
              Developer

              Also note to myself, changed the front-end values passed through a little (monthly => month, yearly => year) need to update back-end.

            • Collapse replies
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 2 hours ago
              Developer

              Just making sure you got this all up to date. Once you have a version ready to go, I'll retest this.

            • Please register or sign in to reply
          • Ben Hayward @benhayward.ben resolved all threads 1 week ago

            resolved all threads

          • Ben Hayward @benhayward.ben added 1 commit 1 week ago

            added 1 commit

            • 56d97028 - Updated for feedback

            Compare with previous version

          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label 1 week ago

            added MR::Awaiting Review scoped label

          • Ben Hayward @benhayward.ben added Squad::Green scoped label 1 week ago

            added Squad::Green scoped label

          • Ben Hayward @benhayward.ben added 1 commit 1 week ago

            added 1 commit

            • bcc90f13 - fixed defaulting setTier

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 6 days ago

            added 1 commit

            • 8c908a80 - Serving plus_guid for consumption on front

            Compare with previous version

          • Ben Hayward @benhayward.ben added 38 commits 6 days ago

            added 38 commits

            • 8c908a80...2f9601c0 - 36 commits from branch master
            • 0bf3c914 - Merge branch 'master' of gitlab.com:minds/engine into feat/plus-tiers-578
            • ebcdbdf5 - serving plus_guid to front-end

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 6 days ago

            added 1 commit

            • cf991b9b - removed unneeded override

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 6 days ago

            added 1 commit

            • 3e91bee5 - Quick fix

            Compare with previous version

          • Ben Hayward @benhayward.ben added 4 commits 2 days ago

            added 4 commits

            • 3e91bee5...5c68c5f8 - 3 commits from branch master
            • dca9180f - Merge branch 'master' into 'feat/plus-tiers-578'

            Compare with previous version

          • Ben Hayward @benhayward.ben added 2 commits 2 days ago

            added 2 commits

            • 6ce7371d - spacing issue
            • b333da6c - Merge branch 'feat/plus-tiers-578' of gitlab.com:minds/engine into feat/plus-tiers-578

            Compare with previous version

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