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 135
    • Issues 135
    • 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
  • !202

Closed
Opened 2 weeks ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe] (feat): also allow to save the nsfw attribute

depends on front!349 (closed)

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/engine.git sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
git checkout -b eiennohi/engine-sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw 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 eiennohi/engine-sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw

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 eiennohi:sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw into master
  • Email patches
  • Plain diff
Pipeline #67031921 passed for 5a5e164e on eiennohi:sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
      Requires approval from Devs. Approved by
      Emiliano Balbuena
      Emiliano Balbuena
      Brian Hatchet
      Brian Hatchet
      Rami Albatal
      Rami Albatal
      Mark Harding
      Mark Harding
      Martin Santangelo
      Martin Santangelo
      Ben Hayward
      Ben Hayward

      Closed by Marcelo Rivera 12 minutes ago

      The changes were not merged into master

      Allows commits from members who can merge to the target branch

      Deletes source branch

      • Discussion 2
      • Commits 2
      • Pipelines 6
      • Changes 2
      1/1 discussion resolved
      • Loading...
      • Marcelo Rivera @eiennohi mentioned in merge request front!349 (closed) 2 weeks ago

        mentioned in merge request front!349 (closed)

      • Ben Hayward @benhayward.ben approved this merge request 2 weeks ago

        approved this merge request

      • Marcelo Rivera @eiennohi added 4 commits 2 weeks ago

        added 4 commits

        • bd4de50f - (fix): token sales
        • 5c795ef3 - (fix): withdraw
        • 7fca4583 - (fix): formatting in offchain wire
        • 1d68cfb7 - (fix): active users

        Compare with previous version

        Toggle commit list
      • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

        added 1 commit

        • bbd18736 - (fix): never include last unit in the given timespan

        Compare with previous version

      • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

        added 1 commit

        • 5ec55be9 - (feat): also allow to save the nsfw attribute

        Compare with previous version

      • Mark Harding
        Mark Harding @markeharding started a discussion on an old version of the diff 2 weeks ago
        Resolved by Marcelo Rivera 2 weeks ago
      • Marcelo Rivera @eiennohi added 1 commit 2 weeks ago

        added 1 commit

        • 5a5e164e - (fix): use setNsfw()

        Compare with previous version

      • Marcelo Rivera @eiennohi resolved all discussions 2 weeks ago

        resolved all discussions

      • Emiliano Balbuena @edgebal approved this merge request 1 week ago

        approved this merge request

      • Mark Harding @markeharding added MR::Awaiting Review label 2 days ago

        added MR::Awaiting Review label

      • Marcelo Rivera
        Marcelo Rivera @eiennohi · 12 minutes ago
        Developer

        closing in favour of !248

      • Marcelo Rivera @eiennohi closed 12 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
      None
      Assign to
      None
      Milestone
      None
      Assign milestone
      None
      Time tracking
      No estimate or time spent
      1
      Labels
      MR::Awaiting Review
      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
      Martin Santangelo
      user avatar
      Ben Hayward
      user avatar
      Marcelo Rivera
      user avatar
      Emiliano Balbuena
      Reference: minds/engine!202