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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 140
    • Issues 140
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 28
    • Merge Requests 28
  • 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
  • !181

Open
Opened 20 hours ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

(fix): Attachment should inherit wire threshold on edit (#458)

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.com/edgebal/engine.git hotfix/edit-paywall
git checkout -b edgebal/engine-hotfix/edit-paywall FETCH_HEAD

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 edgebal/engine-hotfix/edit-paywall

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 edgebal:hotfix/edit-paywall into master
The source branch is 6 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #63382689 passed for 9a39a0fe on edgebal:hotfix/edit-paywall
      Requires 2 more approvals from Devs.
      Brian Hatchet
      Brian Hatchet
      Rami Albatal
      Rami Albatal
      Mark Harding
      Mark Harding
      Marcelo Rivera
      Marcelo Rivera
      Ben Hayward
      Ben Hayward
      Ready to be merged automatically. Ask someone with write access to this repository to merge this request
      Allows commits from members who can merge to the target branch

      Mentions #458

      Deletes source branch

      • Discussion 1
      • Commits 1
      • Pipelines 1
      • Changes 1
      0/1 discussion resolved
      • Loading...
      • Mark Harding
        Mark Harding @markeharding started a discussion on the diff 2 hours ago
        Controllers/api/v1/newsfeed.php
        513 513
        514 514 $activity->indexes = ["activity:$activity->owner_guid:edits"]; //don't re-index on edit
        515 515 (new Core\Translation\Storage())->purge($activity->guid);
        516
        • Mark Harding
          Mark Harding @markeharding · 2 hours ago
          Owner

          Can we move this to an event hook post save event? (noticed we are using Actions\Save below). This file is huge

        Please register or sign in to reply
      • 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
      None
      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
      Rami Albatal
      user avatar
      Mark Harding
      user avatar
      Marcelo Rivera
      user avatar
      Ben Hayward
      user avatar
      Martin Santangelo
      user avatar
      Emiliano Balbuena
      Reference: minds/engine!181