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 208
    • Issues 208
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 28
    • Merge Requests 28
  • 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
  • !281

Merged
Opened 2 weeks ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: (feat): Minds Pro (development branch)

Edited 1 day ago by Emiliano Balbuena

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/minds-pro origin/epic/minds-pro

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/minds-pro-stable
git merge --no-ff epic/minds-pro

Step 4. Push the result of the merge to GitLab

git push origin minds-pro-stable

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/minds-pro into minds-pro-stable
  • Email patches
  • Plain diff
Pipeline #75233134 passed for 05d2acc9 on epic/minds-pro
          Requires 2 more approvals from Devs and Deployers.
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Brian Hatchet
          Brian Hatchet
          Marcelo Rivera
          Marcelo Rivera

          Merged by Emiliano Balbuena 39 minutes ago

          The changes were merged into minds-pro-stable with 05d2acc9

          Pipeline #75238812 passed for 05d2acc9 on minds-pro-stable
                  • Discussion 0
                  • Commits 2
                  • Pipelines 17
                  • Changes 3
                  • Loading...
                  • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                    added 1 commit

                    • 9378e291 - (fix): Support JSON data on rows

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                    added 1 commit

                    • 9d796baa - (fix): Query issues; (chore): Tweak response

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • af51a4cb - (feat): Pro settings

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 30 commits 1 week ago

                    added 30 commits

                    • af51a4cb...2f9601c0 - 29 commits from branch master
                    • efb2b295 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • 0d88c7bc - (feat): Hydrate logo and background from channel

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • 83c8a45d - (chore): Missing pkey on provisioning schema

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 35a18615 - (feat): new api/v2/feeds/channel endpoint

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 78f731c4 - (feat): load groups and added MIN_COUNT

                    Compare with previous version

                  • Emiliano Balbuena @edgebal assigned to @edgebal 1 week ago

                    assigned to @edgebal

                  • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 1 week ago

                    added Product::Pro Squad::Yellow scoped labels

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • 57c29d90 - (fix): Pro settings and style

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 25 commits 6 days ago

                    added 25 commits

                    • 57c29d90...9ecf40f8 - 24 commits from branch master
                    • 3edad780 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                    added 1 commit

                    • 8a304674 - (feat): Footer settings

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                    added 1 commit

                    • d990fea9 - (feat): Logo GUID settings and hydration

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 14 commits 5 days ago

                    added 14 commits

                    • d990fea9...dffd0a4e - 13 commits from branch master
                    • 0050a371 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 day ago

                    added 1 commit

                    • 245d49e6 - (feat): Add transparentized background color

                    Compare with previous version

                  • Emiliano Balbuena @edgebal changed title from WIP: (feat): Minds Pro to WIP: (feat): Minds Pro (development branch) 1 day ago

                    changed title from WIP: (feat): Minds Pro to WIP: (feat): Minds Pro (development branch)

                  • Emiliano Balbuena @edgebal changed target branch from master to minds-pro-stable 1 day ago

                    changed target branch from master to minds-pro-stable

                  • Emiliano Balbuena @edgebal added 1 commit 17 hours ago

                    added 1 commit

                    • 3c6712f0 - (feat): Tag list for Pro

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 hour ago

                    added 1 commit

                    • 05d2acc9 - (feat): Scheme settings

                    Compare with previous version

                  • Emiliano Balbuena @edgebal merged 39 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
                  Assignee
                  Emiliano Balbuena's avatar Emiliano Balbuena @edgebal
                  Assign to
                  None
                  Milestone
                  None
                  Assign milestone
                  None
                  Time tracking
                  No estimate or time spent
                  2
                  Labels
                  Product::Pro Squad::Yellow
                  Assign labels
                  • View project labels
                  Lock merge request
                  Unlocked
                  7
                  7 participants
                  user avatar
                  Martin Santangelo
                  user avatar
                  Mark Harding
                  user avatar
                  Rami Albatal
                  user avatar
                  Brian Hatchet
                  user avatar
                  Marcelo Rivera
                  user avatar
                  Ben Hayward
                  user avatar
                  Emiliano Balbuena
                  Reference: minds/engine!281

                  Revert this commit

                  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 commit

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