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 140
    • Issues 140
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 7
    • Merge Requests 7
  • 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
  • !238

Open
Opened 22 minutes ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

[Sprint/HipsterHedgehog] (fix) change remind unavaible message

Change message for reminded content unavaible because user is blocked. Closes engine/issues/502. @msantang78 remember to upload locales files to poeditor.

Check out, review, and merge locally

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

git fetch https://gitlab.com/juanmsolaro/mobile-native.git sprint/HipsterHedgehog.fix.message.for.reminded.content.where.original.user.is.blocked
git checkout -b juanmsolaro/mobile-native-sprint/HipsterHedgehog.fix.message.for.reminded.content.where.original.user.is.blocked 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 juanmsolaro/mobile-native-sprint/HipsterHedgehog.fix.message.for.reminded.content.where.original.user.is.blocked

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 juanmsolaro:sprint/HipsterHedgehog.fix.message.for.reminded.content.where.original.user.is.blocked into master
The source branch is 4 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #68127494 passed for aeabb349 on juanmsolaro:sprint/HipsterHedgehog.fix.message.for.reminded.content.where.original.user.is.blocked
    No approval required
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request

    Mentions engine#502

    • Discussion 0
    • Commits 1
    • Pipelines 1
    • Changes 3
    • Loading...
    • 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
    Juan Manuel Solaro
    user avatar
    Martin Santangelo
    Reference: minds/mobile-native!238