Skip to content

Next

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

Open
Opened 2 months ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe](bug): Discovery header size adjustments #857

Closes #857

Screenshot_20190624-182511_Minds

Edited 2 months 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 show-search-recent-channels-857
git checkout -b benhayward.ben/mobile-native-show-search-recent-channels-857 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-show-search-recent-channels-857

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:show-search-recent-channels-857 into master
The source branch is 162 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #68221347 passed for 62df4edf on benhayward.ben:show-search-recent-channels-857
    Requires 2 more approvals.
    There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

    Allows commits from members who can merge to the target branch

    Closes #857

    Deletes source branch

    You can merge this merge request manually using the
    • Discussion 1
    • Commits 8
    • Pipelines 8
    • Changes 4
    • Loading...
    • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 months ago

      approved this merge request

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • ef01ed5f - Added in a function to get header height if on the recently visited feed

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • 92d1ee07 - added in old stylesw

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • e6e920e5 - formatting

      Compare with previous version

    • Ben Hayward @benhayward.ben changed the description 2 months ago

      changed the description

    • Ben Hayward @benhayward.ben changed title from Sprint/GiddyGiraffe: Re-showing search on latest channels #857 to Sprint/GiddyGiraffe: Discovery header size adjustments #857 2 months ago

      changed title from Sprint/GiddyGiraffe: Re-showing search on latest channels #857 to Sprint/GiddyGiraffe: Discovery header size adjustments #857

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • 3187c336 - added back in missing padding

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • d054d7bd - WIP: Updates

      Compare with previous version

    • Ben Hayward @benhayward.ben marked as a Work In Progress from benhayward.ben/mobile-native@d054d7bd 2 months ago

      marked as a Work In Progress from benhayward.ben/mobile-native@d054d7bd

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • 0ca1c3dd - Further updates; need to discuss with Martin

      Compare with previous version

    • Ben Hayward @benhayward.ben added 1 commit 2 months ago

      added 1 commit

      • 62df4edf - all working now

      Compare with previous version

    • Ben Hayward @benhayward.ben unmarked as a Work In Progress 2 months ago

      unmarked as a Work In Progress

    • Ben Hayward
      Ben Hayward @benhayward.ben · 38 minutes ago
      Developer

      @msantang78 do you still want this change?

    • 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
    0 Assignees
    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
    3
    3 participants
    user avatar
    Ben Hayward
    user avatar
    Brian Hatchet
    user avatar
    Martin Santangelo
    Reference: minds/mobile-native!229