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 242
    • Issues 242
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 31
    • Merge Requests 31
  • 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
  • !296

Closed
Opened 1 week ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: (feat): Minds Pro (development branch) - Release 3

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 #79228470 failed for 6a3e8186 on epic/minds-pro
          Requires 2 more approvals from Devs and Deployers.
          Brian Hatchet
          Brian Hatchet
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera
          Rami Albatal
          Rami Albatal

          Closed by Emiliano Balbuena 8 minutes ago

          The changes were not merged into minds-pro-stable

          • Discussion 0
          • Commits 37
          • Pipelines 6
          • Changes 1000+
          • Loading...
          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • 92e364cd - (feat): Allow logging in from Pro site

            Compare with previous version

          • Emiliano Balbuena @edgebal added 1 commit 1 week ago

            added 1 commit

            • b375d8d4 - (fix): List groups owned by Pro channel

            Compare with previous version

          • Emiliano Balbuena @edgebal added 20 commits 2 days ago

            added 20 commits

            • 022020ca - (feat) Add contribution values to wallet overview api - #746
            • 3a730050 - Merge branch 'feat/746-wallet-api' into 'master'
            • 646eb771 - (chore): bump surge package
            • 3f2c0632 - (feat): implements sentry for php
            • 0e9537b5 - (chore): disable braintree webhook - closes #771 (closed)
            • 6b532313 - (fix): do not show suggestions to logged out users
            • d57202a4 - (fix): do not return balance if no user set
            • 0661d268 - (fix): suggested users should not be called if deleted or disabled - resolves #768 (closed)
            • b3937061 - (fix): remove response key
            • eb3c70ee - (chore): log mobile users with sentry
            • 190e4760 - (feat): set user guids of mobile too, use the Session class
            • d9d323af - (chore): retry on conflicts for subscriptions es delegate
            • c1dac85a - (fix): null entity on media sidebar suggestion throwing exception
            • dcd16b0d - (fix) Populate guid of notifications with correct value; Resolve invalid...
            • 26c983ca - Merge branch 'fix/633-empty-guid' into 'master'
            • 987be151 - (chore): perform lint of entire codebase
            • 3d98bd3d - Merge branch 'chore/lint' into 'master'
            • 295cd706 - (chore) Changing CI_COMMIT_SHA to CI_PIPELINE_ID
            • 8e6942b6 - Merge branch 'fix/use-pipeline-id-vs-commit' into 'master'
            • bb12f5f2 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

            Compare with previous version

            Toggle commit list
          • Emiliano Balbuena @edgebal added 1 commit 2 days ago

            added 1 commit

            • e45b8753 - (chore): Lint code

            Compare with previous version

          • Emiliano Balbuena @edgebal added 2 commits 1 day ago

            added 2 commits

            • 99049227 - (feat): Tile ratio settings
            • 549189d1 - (chore): Trim settings; (feat): Export single-line headline

            Compare with previous version

          • Emiliano Balbuena @edgebal added 12 commits 1 hour ago

            added 12 commits

            • 2989bb14 - (chore): august blogs email
            • d1e4ff4f - (fix): do not do a strict check in array
            • bba21dbe - (fix): do not use strict in_array when dealing with integers
            • 365b8c4b - (chore): increase canary to 12 hours
            • e16ed1d3 - Sprint/InterestingIguana: Offchain boost rate limiting #475 (closed)
            • 514184e4 - Merge branch 'feat/rate-limit-boost-475' into 'master'
            • a437ec98 - (chore): change text to 24 hours vs day
            • 39d0fa76 - (chore): do not use strict base64_decode
            • 1231e20a - (fix): do not strict type in_array
            • abacfb66 - (feat): wire emails support multiple currencies
            • 48536207 - Merge branch 'epic/37-wire' into 'master'
            • 6a3e8186 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

            Compare with previous version

            Toggle commit list
          • Emiliano Balbuena @edgebal closed 8 minutes ago

            closed

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