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 135
    • Issues 135
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 31
    • Merge Requests 31
  • 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 1 week 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 28 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #64170392 passed for 522092ca on edgebal:hotfix/edit-paywall
      Requires approval from Devs. Approved by
      Brian Hatchet
      Brian Hatchet
      Mark Harding
      Mark Harding
      Martin Santangelo
      Martin Santangelo
      Marcelo Rivera
      Marcelo Rivera
      Ben Hayward
      Ben Hayward
      Rami Albatal
      Rami Albatal
      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 2
      • Commits 3
      • Pipelines 3
      • Changes 3
      1/1 discussion resolved
      • Loading...
      • Mark Harding
        Mark Harding @markeharding started a discussion on the diff 1 week ago
        Resolved by Emiliano Balbuena 5 days ago
      • Emiliano Balbuena @edgebal added 1 commit 5 days ago

        added 1 commit

        • 4eed2ec0 - (refactor): Poster core module and delegate

        Compare with previous version

      • Emiliano Balbuena @edgebal resolved all discussions 5 days ago

        resolved all discussions

      • Emiliano Balbuena @edgebal added 1 commit 4 days ago

        added 1 commit

        • 522092ca - (feat): Use Save action when editing attachment paywall

        Compare with previous version

      • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 4 days ago

        approved this merge request

      • Mark Harding
        Mark Harding @markeharding · 1 hour ago
        Owner

        @edgebal can we move Core\Poster to Core\Feeds\Activity (lose the Poster name).

      • 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
      Mark Harding
      user avatar
      Martin Santangelo
      user avatar
      Marcelo Rivera
      user avatar
      Ben Hayward
      user avatar
      Rami Albatal
      user avatar
      Brian Hatchet
      user avatar
      Emiliano Balbuena
      Reference: minds/engine!181