(cache)[Sprint/HipsterHedgehog] (fix) change remind unavaible message (!238) · Merge Requests · Minds / Minds Mobile

Merged

Opened 5 hours ago by Juan Manuel Solaro @juanmsolaro

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

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

Merged by Martin Santangelo 1 hour ago

The changes were merged into master with 9f018449

Mentions engine#502

Pipeline #68181635 failed for 9f018449 on master

Discussion 0
Commits 1
Pipelines 1
Changes 3

Martin Santangelo @msantang78 merged 1 hour ago

merged
Martin Santangelo @msantang78 mentioned in commit 9f018449 1 hour ago

mentioned in commit 9f018449
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

Labels

None

Assign labels

View project labels

Lock merge request

Unlocked

2 participants

Martin Santangelo

Juan Manuel Solaro

Reference: minds/mobile-native!238

Revert this merge request

This will create a new commit in order to revert the existing changes.

Revert in branch

Switch branch

Cancel

A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Pick into branch

Switch branch

Cancel

A new branch will be created in your fork and a new merge request will be started.