Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 138
    • Issues 138
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 6
    • Merge Requests 6
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !224

Open
Opened 1 week ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe](bug) Various minor fixes 924

Closes #924

Reminded mature content overlay needed a resize (without the second change implemented)

2019-06-13_20-35

Moved dropdown in corner of activity, up

2019-06-13_21-38!

Screencast_2019-06-13_21_41_21

Edited 1 week ago by Ben Hayward

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/mobile-native.git various-minor-fixes-924
git checkout -b benhayward.ben/mobile-native-various-minor-fixes-924 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 benhayward.ben/mobile-native-various-minor-fixes-924

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 benhayward.ben:various-minor-fixes-924 into master
The source branch is 34 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #66326134 passed for 7c3c2aab on benhayward.ben:various-minor-fixes-924
    No approval required
    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 #924

    Deletes source branch

    • Discussion 3
    • Commits 6
    • Pipelines 5
    • Changes 6
    1/2 discussions resolved
    • Loading...
    • Ben Hayward @benhayward.ben changed the description 1 week ago

      changed the description

    • Ben Hayward @benhayward.ben added 1 commit 1 week ago

      added 1 commit

      • b1b32558 - Updating snapshots

      Compare with previous version

    • Martin Santangelo
      Martin Santangelo @msantang78 started a discussion on an old version of the diff 1 week ago
      Resolved by Ben Hayward 1 week ago
    • Ben Hayward @benhayward.ben added 1 commit 1 week ago

      added 1 commit

      • 0c2ae031 - Update ExplicitOverlay.js

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 1 week ago

      added 1 commit

      • 7c3c2aab - Update ExplicitOverlay.js

      Compare with previous version

    • Ben Hayward @benhayward.ben resolved all discussions 1 week ago

      resolved all discussions

    • Ben Hayward @benhayward.ben mentioned in merge request !228 (merged) 6 days ago

      mentioned in merge request !228 (merged)

    • Martin Santangelo
      Martin Santangelo @msantang78 started a discussion on the diff 1 hour ago
      src/newsfeed/activity/Activity.js
      75 75 );
      76 76
      77 77 const show_overlay = (entity.shouldBeBlured() && !entity.is_parent_mature) && !(entity.shouldBeBlured() && entity.is_parent_mature);
      78 const overlay = (show_overlay) ? <ExplicitOverlay
      78 const overlay = (show_overlay) ? <ExplicitOverlay style={styles.overlay}
      • Martin Santangelo
        Martin Santangelo @msantang78 · 1 hour ago
        Maintainer

        I think the style={styles.overlay} is not necessary here

      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
    2
    2 participants
    user avatar
    Martin Santangelo
    user avatar
    Ben Hayward
    Reference: minds/mobile-native!224