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 148
    • Issues 148
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 49
    • Merge Requests 49
  • 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
  • !258

Open
Opened 1 day ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

Feat/email schema 187

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/email-schema-187 origin/feat/email-schema-187

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/email-schema-187

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/email-schema-187 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #70150301 failed for 18a4c6e4 on feat/email-schema-187
          Requires 2 more approvals from Devs and Deployers.
          Ben Hayward
          Ben Hayward
          Marcelo Rivera
          Marcelo Rivera
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Rami Albatal
          Rami Albatal
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 3
          • Commits 3
          • Pipelines 2
          • Changes 20
          0/2 threads resolved
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Interesting Iguana 1 day ago

            changed milestone to %sprint: Interesting Iguana

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
            Core/Email/Campaigns/EmailCampaign.php
            65 66
            66 67 return true;
            67 68 }
            69
            70 /**
            71 * Returns the short name of the class as the template name.
            72 */
            73 public function getEmailCampaignId()
            74 {
            75 return (new \ReflectionClass($this))->getShortName();
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 1 day ago
              Maintainer

              This still requires @markeharding 's approval. FYI: @edgebal this was the only unresolved issue on the previous MR

            • Please register or sign in to reply
            • Mark Harding
              Mark Harding @markeharding · 7 hours ago
              Owner

              @brianhatchet can you make sure the schema is in the provisioner cql file?

            • Collapse replies
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 15 minutes ago
              Maintainer

              Added

            • Please register or sign in to reply
          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 16 minutes ago

            added 1 commit

            • 18a4c6e4 - CR changes, adding table to provisioner

            Compare with previous version

          • 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
          Brian Hatchet's avatar Brian Hatchet @brianhatchet
          Assign to
          sprint: Interesting Iguana
          Milestone
          sprint: Interesting Iguana
          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
          Ben Hayward
          user avatar
          Marcelo Rivera
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          Reference: minds/engine!258