Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 834
    • Issues 834
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 61
    • Merge Requests 61
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !349

Open
Opened 5 days ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe] (feat): ability for channels to self-declare nsfw

closes minds#486

depends on engine!202

Edited 3 days ago by Marcelo Rivera

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/front.git sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
git checkout -b eiennohi/front-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/front-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 27 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #66244746 (#1933) passed for 6fec3245 on eiennohi:sprint/GiddyGiraffe.feat.ability-for-channels-to-self-declare-nsfw
    Requires approval from Devs. Approved by
    Ben Hayward
    Ben Hayward
    Brian Hatchet
    Brian Hatchet
    Emiliano Balbuena
    Emiliano Balbuena
    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

    Closes minds#486

    Deletes source branch

    • Discussion 5
    • Commits 1
    • Pipelines 2
    • Changes 5
    0/3 discussions resolved
    • Loading...
    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet started a discussion on an old version of the diff 4 days ago
      Last updated by Marcelo Rivera 3 days ago
      src/app/interfaces/entities.ts
      67 67 is_mature?: boolean;
      68 68 mature_lock?: boolean;
      69 69 tags?: Array<string>;
      70 nsfw: Array<number>;
      • Brian Hatchet
        Brian Hatchet :speech_balloon: @brianhatchet · 4 days ago
        Maintainer

        <3

      • Marcelo Rivera @eiennohi changed this line in version 2 of the diff 3 days ago

        changed this line in version 2 of the diff

      Please register or sign in to reply
    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 4 days ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding · 3 days ago
      Owner

      @eiennohi can we check failing tests?

    • Marcelo Rivera @eiennohi added 1 commit 3 days ago

      added 1 commit

      • 6fec3245 - (feat): ability for channels to self-declare nsfw

      Compare with previous version

    • Marcelo Rivera @eiennohi mentioned in merge request engine!202 3 days ago

      mentioned in merge request engine!202

    • Marcelo Rivera @eiennohi changed the description 3 days ago

      changed the description

    • Ben Hayward @benhayward.ben approved this merge request 19 hours ago

      approved this merge request

    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 7 hours ago
      Last updated by Mark Harding 7 hours ago
      src/app/modules/channels/channel.component.scss
      407 m-nsfw-selector {
      408 display: inline-block;
      409 border-radius: 24px;
      410 padding: 3px 16px;
      411 @include m-theme(){
      412 border: 1px solid themed($m-grey-100);
      413 }
      414
      415 .m-nsfwSelector__label {
      416 & > m-tooltip i {
      417 display: none;
      418 }
      419
      420 > span {
      421 font-size: 13px;
      422 padding-left: 4px;
      • Mark Harding
        Mark Harding @markeharding · 7 hours ago
        Owner

        Remove left padding? Screen_Shot_2019-06-17_at_10.01.13_AM

      • Mark Harding
        Mark Harding @markeharding · 7 hours ago
        Owner

        Also, cursor should be pointer on hover

      Please register or sign in to reply
    • Mark Harding
      Mark Harding @markeharding started a discussion on the diff 7 hours ago
      src/app/modules/channels/sidebar/sidebar.html
      71 71 </div>
      72 72 </div>
      73 73
      74 <div class="m-channel-bio-editor m-channel-nsfw-editor" *ngIf="editing && isOwner()">
      75 <div class="m-channel-bio-input">
      76 <i class="material-icons mdl-color-text--blue-grey-300">explicit</i>
      77 <m-nsfw-selector
      78 [selected]="user.nsfw"
      • Mark Harding
        Mark Harding @markeharding · 7 hours ago
        Owner

        Not populating NSFW 5

        Screen_Shot_2019-06-17_at_10.02.32_AM

        Screen_Shot_2019-06-17_at_10.02.39_AM

      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
    6
    6 participants
    user avatar
    Brian Hatchet
    user avatar
    Emiliano Balbuena
    user avatar
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Ben Hayward
    user avatar
    Marcelo Rivera
    Reference: minds/front!349