Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-21786 Add missing bracket to i18n/en.json that was creating errors on javascript console #4681

Merged
merged 3 commits into from Jan 20, 2020
Merged

MM-21786 Add missing bracket to i18n/en.json that was creating errors on javascript console #4681

merged 3 commits into from Jan 20, 2020

Conversation

larkox
Copy link
Contributor

@larkox larkox commented Jan 16, 2020 •
edited

Summary

Add missing bracket to i18n/en.json that was creating errors on javascript console

Ticket Link

https://mattermost.atlassian.net/browse/MM-21786

Related Pull Requests

None

Screenshots

None

@amyblais amyblais added this to the v5.20.0 milestone Jan 16, 2020
@jespino jespino added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Jan 17, 2020
jespino
jespino approved these changes Jan 17, 2020
View reviewed changes
Copy link
Member

@jespino jespino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Thanks @larkox! 🎉

hmhealey
hmhealey approved these changes Jan 17, 2020
View reviewed changes
Copy link
Member

@hmhealey hmhealey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good find! Thanks for fixing that.

@hmhealey hmhealey removed the 2: Dev Review Requires review by a core commiter label Jan 17, 2020
@amyblais amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Jan 17, 2020
@saturninoabril saturninoabril requested review from saturninoabril and removed request for ogi-m January 20, 2020 13:07
saturninoabril
saturninoabril approved these changes Jan 20, 2020
View reviewed changes
Copy link
Member

@saturninoabril saturninoabril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and passed. Thanks @larkox!

@saturninoabril saturninoabril added 4: Reviews Complete All reviewers have approved the pull request QA Review Done and removed 3: QA Review Requires review by a QA tester labels Jan 20, 2020
@saturninoabril saturninoabril merged commit a9fb313 into mattermost:master Jan 20, 2020
@mattermod
Copy link
Contributor

@larkox
Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-#4681-upstream-release-5.2-1579525843
Branch 'automated-cherry-pick-of-#4681-upstream-release-5.2-1579525843' set up to track remote branch 'release-5.2' from 'upstream'.
+++ Downloading patch to /tmp/4681.patch (in case you need to do this again)

+++ About to attempt cherry pick of PR. To reattempt:
  $ git am -3 /tmp/4681.patch

Applying: Add missing bracket that was creating errors on javascript console
Using index info to reconstruct a base tree...
M	i18n/en.json
Falling back to patching base and 3-way merge...
Auto-merging i18n/en.json
CONFLICT (content): Merge conflict in i18n/en.json
Patch failed at 0001 Add missing bracket that was creating errors on javascript console
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

+++ Conflicts detected:

UU i18n/en.json

+++ Aborting in-progress git am.

+++ Returning you to the master branch and cleaning up.

saturninoabril pushed a commit that referenced this pull request Jan 20, 2020
@larkox @saturninoabril
Add missing bracket to i18n/en.json that was creating errors on javas…
f0a4e39 
…cript console (#4681)

* Add missing bracket that was creating errors on javascript console

* Update lastViewedAt expected prop type
@saturninoabril
Copy link
Member

Done manual cherry-pick onto release-5.20 - f0a4e39

@saturninoabril saturninoabril added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Jan 20, 2020
@saturninoabril saturninoabril changed the title Add missing bracket to i18n/en.json that was creating errors on javascript console MM-21786 Add missing bracket to i18n/en.json that was creating errors on javascript console Jan 20, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Jan 20, 2020
sudheerDev pushed a commit that referenced this pull request Jan 21, 2020
@larkox @sudheerDev
Add missing bracket to i18n/en.json that was creating errors on javas…
c4da54b 
…cript console (#4681)

* Add missing bracket that was creating errors on javascript console

* Update lastViewedAt expected prop type
fmunshi pushed a commit to fmunshi/mattermost-webapp that referenced this pull request Jan 21, 2020
@larkox
Add missing bracket to i18n/en.json that was creating errors on javas…
8a46ce0 
…cript console (mattermost#4681)

* Add missing bracket that was creating errors on javascript console

* Update lastViewedAt expected prop type
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jespino jespino jespino approved these changes

@hmhealey hmhealey hmhealey approved these changes

@saturninoabril saturninoabril saturninoabril approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation QA Review Done
Projects
None yet
Milestone
v5.20.0
6 participants
@larkox @mattermod @saturninoabril @jespino @hmhealey @amyblais