12.8 Autodeploy: Revert "Merge branch '118442-restyle-changes-header-and-file-tree' into 'master'"
What does this MR do?
This resolves the conflicts in the !23428 (merged) and the 12-8-auto-deploy-20200119
branch.
The only conflicts were with the gitlab.pot
file
diff -u <(git diff origin/12-8-auto-deploy-20200119...revert-22364-12-8-autodeploy) <(git diff revert-22364~2...revert-22364)
--- /dev/fd/63 2020-01-21 15:24:21.000000000 -0600
+++ /dev/fd/62 2020-01-21 15:24:21.000000000 -0600
@@ -386,10 +386,10 @@
+author:
+type: fixed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
-index 04ce92d64ec..743a7c1a56c 100644
+index 5ae8d8b23fe..14891309a1b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
-@@ -8065,6 +8065,11 @@ msgstr ""
+@@ -8097,6 +8097,11 @@ msgstr ""
msgid "Fetching licenses failed. You are not permitted to perform this action."
msgstr ""
@@ -401,7 +401,7 @@
msgid "File Hooks"
msgstr ""
-@@ -11639,10 +11644,10 @@ msgstr ""
+@@ -11680,10 +11685,10 @@ msgstr ""
msgid "MergeRequest|Error loading full diff. Please try again."
msgstr ""
@@ -414,17 +414,17 @@
msgstr ""
msgid "Merged"
-@@ -21719,9 +21724,6 @@ msgstr ""
+@@ -21778,9 +21783,6 @@ msgstr ""
msgid "among other things"
msgstr ""
-msgid "and"
-msgstr ""
-
- msgid "archived"
+ msgid "any-approver for the merge request already exists"
msgstr ""
-@@ -22149,11 +22151,6 @@ msgstr ""
+@@ -22220,11 +22222,6 @@ msgstr ""
msgid "failed to dismiss associated finding(id=%{finding_id}): %{message}"
msgstr ""