Skip to content

Next

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

Merged
Opened 1 day ago by Mark Harding@markeharding2 of 3 tasks completed2/3 tasks
  • Report abuse
Report abuse

WIP: Epic/pro affiliate launch

  • Pro draft mode
  • Analytics and earnings console
  • Upgrades page

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/pro-affiliate-launch" "origin/epic/pro-affiliate-launch"

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/pro-affiliate-launch"

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/pro-affiliate-launch into master
  • Email patches
  • Plain diff
Pipeline #89283409 canceled for b616c767 on epic/pro-affiliate-launch
              Requires 3 more approvals from Devs, Deployers, and QA.
              Emiliano Balbuena
              Emiliano Balbuena
              Brian Hatchet
              Brian Hatchet
              Xander Miller
              Xander Miller

              Merged by Mark Harding 55 minutes ago

              The changes were merged into master with bc3d6cdf

              Closed #2107 (closed), engine#933 (closed), engine#944 (closed), and engine#945 (closed)

              Pipeline #89284012 running for bc3d6cdf on master
                            • Discussion 0
                            • Commits 36
                            • Pipelines 28
                            • Changes 159
                            • Loading...
                            • Mark Harding @markeharding changed milestone to %Minds Pro #rollout 1 day ago

                              changed milestone to %Minds Pro #rollout

                            • Mark Harding @markeharding added 1 commit 1 day ago

                              added 1 commit

                              • ebeeb266 - (feat): introduces upgrades page

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 1 day ago

                              added 1 commit

                              • 86ebfac8 - (fix): AOT issue

                              Compare with previous version

                            • Mark Harding @markeharding added 2 commits 1 day ago

                              added 2 commits

                              • 8b75eb9b - (feat): send userChanged event
                              • db33e675 - Merge branch 'fix/unsubscribe-doesnt-update-847' into 'epic/pro-affiliate-launch'

                              Compare with previous version

                            • Mark Harding @markeharding added 2 commits 1 day ago

                              added 2 commits

                              • 8ac8932a - Boost button should not show on pro pages
                              • 9ca0e752 - Merge branch 'fix/hide-boost-button-2081' into 'epic/pro-affiliate-launch'

                              Compare with previous version

                            • Mark Harding @markeharding added 2 commits 1 day ago

                              added 2 commits

                              • 42b053e1 - (fix): Upvotes do not appear to have worked until you refresh
                              • d9a25209 - Merge branch 'fix/disappearing-thumbs-2072' into 'epic/pro-affiliate-launch'

                              Compare with previous version

                            • Mark Harding @markeharding added 2 commits 21 hours ago

                              added 2 commits

                              • 73dedbd0 - (feat): New Plus marketing page
                              • 68dd52e5 - Merge branch 'goal/upgrades-page-mvp' into 'epic/pro-affiliate-launch'

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 9 hours ago

                              added 1 commit

                              • 5f6d8f96 - Merge branch 'fix/hide-text-posts-933' into 'master'

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 8 hours ago

                              added 1 commit

                              • 0ff5e41f - (fix): move service to component so it is destroyed - closes engine#945 (closed)

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 8 hours ago

                              added 1 commit

                              • 3df745ce - (chore): remove currency params for more info links

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 8 hours ago

                              added 1 commit

                              • fdaffa8d - (feat): Link to pro / payouts in earnings tab

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 8 hours ago

                              added 1 commit

                              • b53b08b0 - (fix): css to allow for tooltip overflow

                              Compare with previous version

                            • Olivia Madrid @omadrid added 5 commits 8 hours ago

                              added 5 commits

                              • b53b08b0...68a83066 - 2 commits from branch master
                              • b9ee063c - (feat): analytics v2 - mobile and table styles
                              • 2ece4ce3 - Merge branch 'master' of gitlab.com:minds/front into epic/pro-affiliate-launch
                              • b02c401c - Merge remote-tracking branch 'refs/remotes/origin/epic/pro-affiliate-launch'...

                              Compare with previous version

                              Toggle commit list
                            • Mark Harding @markeharding added 1 commit 7 hours ago

                              added 1 commit

                              • ba622bbd - (chore): footer updates - closes engine#944 (closed)

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 7 hours ago

                              added 1 commit

                              • 314d0137 - (chore): press links - engine#948 (closed)

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 7 hours ago

                              added 1 commit

                              • 60e069e2 - (fix): implementation issues with @omadrid push resolved

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 6 hours ago

                              added 1 commit

                              • 10e6989c - (fix): background should be white - engien#950

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 4 hours ago

                              added 1 commit

                              • ac7422ff - (fix): engine#951 (closed) - do not show upgrade button if already on plan

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 4 hours ago

                              added 1 commit

                              • f970d35b - (fix): engine#956 (closed) - table overflow

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 3 hours ago

                              added 1 commit

                              • 178c8c16 - (fix): clicking on selected option does not break

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 2 hours ago

                              added 1 commit

                              • 574e8ad7 - (feat): Redirect to /login and back if not logged in during upgrade

                              Compare with previous version

                            • Mark Harding @markeharding added 2 commits 1 hour ago

                              added 2 commits

                              • 712dc555 - Merge branch 'fix/filter-issue-in-pro' into 'master'
                              • c80b3f12 - (chore): put purchase of pro behind feature flag

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 1 hour ago

                              added 1 commit

                              • 84afeefe - (fix): #2097 (closed) positioning of pro logo

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 1 hour ago

                              added 1 commit

                              • 9aa73b5b - (fix): total view overlapping - engine#959 (closed)

                              Compare with previous version

                            • Mark Harding @markeharding added 1 commit 58 minutes ago

                              added 1 commit

                              • b616c767 - (chore): analytics for pro only atm

                              Compare with previous version

                            • Mark Harding @markeharding merged 55 minutes ago

                              merged

                            • 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
                            Pro soft launch
                            Milestone
                            Pro soft launch
                            Assign milestone
                            None
                            Time tracking
                            No estimate or time spent
                            0
                            Labels
                            None
                            Assign labels
                            • View project labels
                            Lock merge request
                            Unlocked
                            10
                            10 participants
                            user avatar
                            Ben Hayward
                            user avatar
                            Martin Santangelo
                            user avatar
                            Guy Thouret
                            user avatar
                            Marcelo Rivera
                            user avatar
                            Emiliano Balbuena
                            user avatar
                            Brian Hatchet
                            user avatar
                            Juan Manuel Solaro
                            Reference: minds/front!590

                            Revert this merge request

                            This will create a new commit in order to revert the existing changes.

                            Switch branch
                            Cancel
                            A new branch will be created in your fork and a new merge request will be started.

                            Cherry-pick this merge request

                            Switch branch
                            Cancel
                            A new branch will be created in your fork and a new merge request will be started.