Skip to content

Next

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

Open
Opened 3 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

WIP: [Sprint/JollyJellyfish](feat) Plus tiers engine#578

Depends on engine#578 Closes mobile-native#1093 (closed)

Need to add tests before im happy.

Edited 3 days 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 8 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #72994172 passed for bc487db6 on feat/plus-tiers-578
          Requires 2 more approvals from Devs and Deployers.
          Mark Harding
          Mark Harding
          Marcelo Rivera
          Marcelo Rivera
          Martin Santangelo
          Martin Santangelo
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          This is a Work in Progress

          Closes mobile-native#1093 (closed)

          Mentions engine#578

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 5
          • Commits 8
          • Pipelines 7
          • Changes 10
          2/2 threads resolved
          • Loading...
          • Ben Hayward @benhayward.ben mentioned in merge request engine!279 3 days ago

            mentioned in merge request engine!279

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

            added 1 commit

            • 9ddbd7fe - fixed tests

            Compare with previous version

          • Ben Hayward @benhayward.ben changed the description 3 days ago

            changed the description

          • Ben Hayward @benhayward.ben changed the description 3 days ago

            changed the description

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

            added 1 commit

            • a4717b76 - added tests for new component

            Compare with previous version

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

            added 1 commit

            • 149294c3 - added test

            Compare with previous version

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

            added 1 commit

            • 32bff9c5 - theming

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 2 days ago
            Resolved by Ben Hayward 2 days ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 2 days ago
            Resolved by Ben Hayward 2 days ago
          • Mark Harding
            Mark Harding @markeharding · 2 days ago
            Owner

            Looking good. Beware of modal -> modal flow though, I think it will replace it and close the previous one down (so not going back).

            Also, please don't push up fit.. we should open a ticket to put something in the CI to warn us.

          • Ben Hayward @benhayward.ben added MR::Requires Changes Squad::Green scoped labels 2 days ago

            added MR::Requires Changes Squad::Green scoped labels

          • Ben Hayward
            Ben Hayward @benhayward.ben · 2 days ago
            Developer

            Crap! Sorry about that. Made a ticket for it here minds#694

            I'll have a think about it. I had a google and found a few hooks we could maybe use / adapt

            • http://niffic.se/2019/05/git-hook-to-stop-committing-focused-tests/
            • https://gist.github.com/DerLobi/d938ac7dc422145f85e6
          • Ben Hayward @benhayward.ben added 1 commit 2 days ago

            added 1 commit

            • 56321036 - Updated to meet feedback (please squash)

            Compare with previous version

          • Ben Hayward @benhayward.ben resolved all threads 2 days ago

            resolved all threads

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

            added 1 commit

            • bc487db6 - Grabbed plus user from config

            Compare with previous version

          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label 39 minutes ago

            added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label

          • Ben Hayward
            Ben Hayward @benhayward.ben · 39 minutes ago
            Developer

            Awaiting feedback to continue and make responsive.

          • 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
          6
          6 participants
          user avatar
          Mark Harding
          user avatar
          Marcelo Rivera
          user avatar
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          Reference: minds/front!460