Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 168
    • Issues 168
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 46
    • Merge Requests 46
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !267

Open
Opened 4 days ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

(feat) Specify From minds.com on sms messages

Added "from minds.com:..." to message body.

Edited 1 hour ago by Mark Harding

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/add-from-sms-message origin/feat/add-from-sms-message

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/add-from-sms-message

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/add-from-sms-message into master
The source branch is 38 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #71282482 failed for 047e5e09 on feat/add-from-sms-message
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Ben Hayward
          Ben Hayward
          Marcelo Rivera
          Marcelo Rivera
          Martin Santangelo
          Martin Santangelo
          Emiliano Balbuena
          Emiliano Balbuena

          Set by Mark Harding to be merged automatically when the pipeline succeeds

          The changes will be merged into master

          The source branch will be deleted

          Deletes source branch

          • Discussion 6
          • Commits 3
          • Pipelines 3
          • Changes 2
          2/2 threads resolved
          • Loading...
          • Juan Manuel Solaro
            Juan Manuel Solaro @juanmsolaro · 4 days ago
            Developer

            It's the message ok? @markeharding

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 4 days ago
            Resolved by Juan Manuel Solaro 1 hour ago
          • Mark Harding
            Mark Harding @markeharding · 4 days ago
            Owner

            Looks like we have some failing tests too

          • Mark Harding @markeharding added MR::Requires Changes label 3 days ago

            added MR::Requires Changes label

          • Juan Manuel Solaro @juanmsolaro added 1 commit 1 hour ago

            added 1 commit

            • 63c2228a - (fix) move 'from message' to twofactor and phone

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Juan Manuel Solaro 1 hour ago
          • Juan Manuel Solaro @juanmsolaro added 1 commit 1 hour ago

            added 1 commit

            • 047e5e09 - (fix) keep config as it was first

            Compare with previous version

          • Mark Harding @markeharding approved this merge request 1 hour ago

            approved this merge request

          • Mark Harding @markeharding unmarked as a Work In Progress 1 hour ago

            unmarked as a Work In Progress

          • Mark Harding @markeharding enabled an automatic merge when the pipeline for 047e5e09 succeeds 1 hour ago

            enabled an automatic merge when the pipeline for 047e5e09 succeeds

          • Mark Harding @markeharding canceled the automatic merge 1 hour ago

            canceled the automatic merge

          • Mark Harding @markeharding enabled an automatic merge when the pipeline for 047e5e09 succeeds 1 hour ago

            enabled an automatic merge when the pipeline for 047e5e09 succeeds

          • Juan Manuel Solaro @juanmsolaro resolved all threads 1 hour ago

            resolved all threads

          • 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
          1
          Labels
          MR::Requires Changes
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          8
          8 participants
          user avatar
          Brian Hatchet
          user avatar
          Ben Hayward
          user avatar
          Marcelo Rivera
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          user avatar
          Rami Albatal
          user avatar
          Juan Manuel Solaro
          Reference: minds/engine!267