Commit 7c609212 authored by Simon Knox's avatar Simon Knox

Merge branch 'pms-community-merging-messages' into 'master'

Add more merging messages from the community

See merge request gitlab-org/gitlab!74720
parents 5fcb5055 164200c7
...@@ -50,6 +50,18 @@ export const MERGE_ACTIVE_STATUS_PHRASES = [ ...@@ -50,6 +50,18 @@ export const MERGE_ACTIVE_STATUS_PHRASES = [
message: s__('mrWidget|Merging! This is going to be great…'), message: s__('mrWidget|Merging! This is going to be great…'),
emoji: 'heart_eyes', emoji: 'heart_eyes',
}, },
{
message: s__('mrWidget|Merging! Lift-off in 5… 4… 3…'),
emoji: 'rocket',
},
{
message: s__('mrWidget|Merging! The changes are leaving the station…'),
emoji: 'bullettrain_front',
},
{
message: s__('mrWidget|Merging! Take a deep breath and relax…'),
emoji: 'sunglasses',
},
]; ];
const STATE_MACHINE = { const STATE_MACHINE = {
......
...@@ -41517,6 +41517,15 @@ msgstr "" ...@@ -41517,6 +41517,15 @@ msgstr ""
msgid "mrWidget|Merging! Everything's good…" msgid "mrWidget|Merging! Everything's good…"
msgstr "" msgstr ""
msgid "mrWidget|Merging! Lift-off in 5… 4… 3…"
msgstr ""
msgid "mrWidget|Merging! Take a deep breath and relax…"
msgstr ""
msgid "mrWidget|Merging! The changes are leaving the station…"
msgstr ""
msgid "mrWidget|Merging! This is going to be great…" msgid "mrWidget|Merging! This is going to be great…"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment