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 125
    • Issues 125
    • 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
  • !249

Open
Opened 21 hours ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

WIP: [Sprint/InterestingIguana](fix): Stopped rendering of undecrypted messages

Closes #887

janky_messenger_decrypt

image

Edited 13 hours 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 fix/decrypted-chat-hide-1083
git checkout -b benhayward.ben/mobile-native-fix/decrypted-chat-hide-1083 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-fix/decrypted-chat-hide-1083

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:fix/decrypted-chat-hide-1083 into master
The source branch is 64 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #71363526 passed for aa55751d on benhayward.ben:fix/decrypted-chat-hide-1083
    No approval required
    This is a Work in Progress

    Allows commits from members who can merge to the target branch

    Closes #887

    Deletes source branch

    You can merge this merge request manually using the
    • Discussion 1
    • Commits 3
    • Pipelines 3
    • Changes 2
    • Loading...
    • Ben Hayward @benhayward.ben changed the description 20 hours ago

      changed the description

    • Ben Hayward @benhayward.ben marked as a Work In Progress 15 hours ago

      marked as a Work In Progress

    • Ben Hayward @benhayward.ben added 1 commit 13 hours ago

      added 1 commit

      • aa55751d - Show a feint message when decrypt failed

      Compare with previous version

    • Ben Hayward @benhayward.ben changed the description 13 hours ago

      changed the description

    • Brian Hatchet
      Brian Hatchet :speech_balloon: @brianhatchet · 10 minutes ago
      Maintainer

      Ok, I am going to need some help testing this one. Can you walk me through it?

    • 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
    2
    2 participants
    user avatar
    Brian Hatchet
    user avatar
    Ben Hayward
    Reference: minds/mobile-native!249