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 150
    • Issues 150
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 36
    • Merge Requests 36
  • 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

Open
Opened 2 hours ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

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

depends on front!349

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
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #66289742 (#974) passed for efe57c14 on eiennohi:sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
      Requires 2 more approvals from Devs.
      Rami Albatal
      Rami Albatal
      Brian Hatchet
      Brian Hatchet
      Ben Hayward
      Ben Hayward
      Martin Santangelo
      Martin Santangelo
      Mark Harding
      Mark Harding
      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

      Deletes source branch

      • Discussion 0
      • Commits 1
      • Pipelines 4
      • Changes 1
      • Loading...
      • Marcelo Rivera @eiennohi mentioned in merge request front!349 2 hours ago

        mentioned in merge request front!349

      • Ben Hayward @benhayward.ben approved this merge request 57 minutes ago

        approved this merge request

      • Marcelo Rivera @eiennohi added 4 commits 34 minutes 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 15 minutes ago

        added 1 commit

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

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