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 236
    • Issues 236
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 41
    • Merge Requests 41
  • 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
  • !368

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 #89281892 passed for b79b3435 on epic/pro-affiliate-launch
          Requires 3 more approvals from Devs, Deployers, and QA.
          Rami Albatal
          Rami Albatal
          Ben Hayward
          Ben Hayward
          Martin Santangelo
          Martin Santangelo
          Guy Thouret
          Guy Thouret
          Marcelo Rivera
          Marcelo Rivera

          Merged by Mark Harding 1 hour ago

          The changes were merged into master with 5c849f3d

          Pipeline #89282385 waiting for manual action for 5c849f3d on master
                        • Discussion 0
                        • Commits 10
                        • Pipelines 8
                        • Changes 69
                        • 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

                          • 14fab30c - (feat): ability to subscribe to pro package

                          Compare with previous version

                        • Mark Harding @markeharding added 1 commit 1 day ago

                          added 1 commit

                          • 5a927ee5 - (fix): plus fixes with upgrades flow

                          Compare with previous version

                        • Mark Harding @markeharding added 1 commit 21 hours ago

                          added 1 commit

                          • 62c1dba7 - (fix): Correct caps for timestamps and clearer lanugage - closes #2092

                          Compare with previous version

                        • Mark Harding @markeharding added 2 commits 9 hours ago

                          added 2 commits

                          • 22699976 - Marketing pages SEO
                          • 8e259dfa - Merge branch 'goal/upgrades-pages-seo' into 'epic/pro-affiliate-launch'

                          Compare with previous version

                        • Mark Harding @markeharding added 1 commit 8 hours ago

                          added 1 commit

                          • edf8d29b - (feat): updates tooltips - front#2093 (closed)

                          Compare with previous version

                        • Mark Harding @markeharding added 1 commit 1 hour ago

                          added 1 commit

                          • b79b3435 - (fix): ensure the date histogram is for the entire period

                          Compare with previous version

                        • Mark Harding @markeharding merged 1 hour 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
                        Rami Albatal
                        user avatar
                        Ben Hayward
                        user avatar
                        Martin Santangelo
                        user avatar
                        Guy Thouret
                        user avatar
                        Marcelo Rivera
                        user avatar
                        Emiliano Balbuena
                        user avatar
                        Brian Hatchet
                        Reference: minds/engine!368

                        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.