Add latest changes from gitlab-org/gitlab@master

4 files changed, 13 insertions, 16 deletions

diff --git a/app/assets/javascripts/boards/boards_util.js b/app/assets/javascripts/boards/boards_util.js
index 16c833c8aa2..6143beeae45 100644
--- a/app/assets/javascripts/boards/boards_util.js
+++ b/app/assets/javascripts/boards/boards_util.js
@@ -1,4 +1,5 @@
 import { sortBy } from 'lodash';
+import { __ } from '~/locale';
 import { ListType } from './constants';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 
@@ -8,14 +9,15 @@ export function getMilestone() {
 
 export function updateListPosition(listObj) {
   const { listType } = listObj;
-  let { position } = listObj;
+  let { position, title } = listObj;
   if (listType === ListType.closed) {
     position = Infinity;
   } else if (listType === ListType.backlog) {
     position = -Infinity;
+    title = __('Open');
   }
 
-  return { ...listObj, position };
+  return { ...listObj, title, position };
 }
 
 export function formatBoardLists(lists) {
diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js
index e64c82f0342..46d551eb50c 100644
--- a/app/assets/javascripts/boards/stores/actions.js
+++ b/app/assets/javascripts/boards/stores/actions.js
@@ -12,6 +12,7 @@ import {
   fullBoardId,
   formatListsPageInfo,
   formatIssue,
+  updateListPosition,
 } from '../boards_util';
 import createFlash from '~/flash';
 import { __ } from '~/locale';
@@ -131,7 +132,7 @@ export default {
   },
 
   addList: ({ commit }, list) => {
-    commit(types.RECEIVE_ADD_LIST_SUCCESS, list);
+    commit(types.RECEIVE_ADD_LIST_SUCCESS, updateListPosition(list));
   },
 
   fetchLabels: ({ state, commit }, searchTerm) => {
diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
index d25c9a788e0..70c5713b216 100644
--- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
+++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue
@@ -16,6 +16,7 @@ import {
   GlSearchBoxByType,
   GlSprintf,
   GlLoadingIcon,
+  GlSafeHtmlDirective as SafeHtml,
 } from '@gitlab/ui';
 import * as Sentry from '~/sentry/wrapper';
 import { s__, __, n__ } from '~/locale';
@@ -34,7 +35,7 @@ export default {
     'Pipeline|Specify variable values to be used in this run. The values specified in %{linkStart}CI/CD settings%{linkEnd} will be used by default.',
   ),
   formElementClasses: 'gl-mr-3 gl-mb-3 gl-flex-basis-quarter gl-flex-shrink-0 gl-flex-grow-0',
-  errorTitle: __('The form contains the following error:'),
+  errorTitle: __('Pipeline cannot be run.'),
   warningTitle: __('The form contains the following warning:'),
   maxWarningsSummary: __('%{total} warnings found: showing first %{warningsDisplayed}'),
   components: {
@@ -53,6 +54,7 @@ export default {
     GlSprintf,
     GlLoadingIcon,
   },
+  directives: { SafeHtml },
   props: {
     pipelinesPath: {
       type: String,
@@ -335,8 +337,9 @@ export default {
       variant="danger"
       class="gl-mb-4"
       data-testid="run-pipeline-error-alert"
-      >{{ error }}</gl-alert
     >
+      <span v-safe-html="error"></span>
+    </gl-alert>
     <gl-alert
       v-if="shouldShowWarning"
       :title="$options.warningTitle"
@@ -365,7 +368,7 @@ export default {
         </p>
       </details>
     </gl-alert>
-    <gl-form-group :label="s__('Pipeline|Run for')">
+    <gl-form-group :label="s__('Pipeline|Run for branch name or tag')">
       <gl-dropdown :text="refShortName" block>
         <gl-search-box-by-type v-model.trim="searchTerm" :placeholder="__('Search refs')" />
         <gl-dropdown-section-header>{{ __('Branches') }}</gl-dropdown-section-header>
@@ -391,12 +394,6 @@ export default {
           {{ tag.shortName }}
         </gl-dropdown-item>
       </gl-dropdown>
-
-      <template #description>
-        <div>
-          {{ s__('Pipeline|Existing branch name or tag') }}
-        </div></template
-      >
     </gl-form-group>
 
     <gl-loading-icon v-if="isLoading" class="gl-mb-5" size="lg" />
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
index f2685dfbcdb..30e0e552165 100644
--- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
+++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
@@ -172,10 +172,7 @@ export default {
         .catch(this.onUpdateFail);
     },
     onUpdateSuccess() {
-      this.$toast.show(s__('SetStatusModal|Status updated'), {
-        type: 'success',
-        position: 'top-center',
-      });
+      this.$toast.show(s__('SetStatusModal|Status updated'));
       this.closeModal();
       window.location.reload();
     },