Revert "Imrpoved unapproved MR merge button text"

This reverts commit c29f26a880884f118f60d207c808f1806dd9030d.

app/assets/javascripts/boards/components/board_new_issue.vue

@@ -2,9 +2,9 @@
 import $ from 'jquery';
 import { GlButton } from '@gitlab/ui';
 import { getMilestone } from 'ee_else_ce/boards/boards_util';
+import ListIssue from 'ee_else_ce/boards/models/issue';
 import eventHub from '../eventhub';
 import ProjectSelect from './project_select.vue';
-import ListIssue from '../models/issue';
 import boardsStore from '../stores/boards_store';
 
 export default {
@@ -54,6 +54,9 @@ export default {
       const assignees = this.list.assignee ? [this.list.assignee] : [];
       const milestone = getMilestone(this.list);
 
+      const { weightFeatureAvailable } = boardsStore;
+      const { weight } = weightFeatureAvailable ? boardsStore.state.currentBoard : {};
+
       const issue = new ListIssue({
         title: this.title,
         labels,
@@ -61,6 +64,7 @@ export default {
         assignees,
         milestone,
         project_id: this.selectedProject.id,
+        weight,
       });
 
       eventHub.$emit(`scroll-board-list-${this.list.id}`);

ee/app/assets/javascripts/boards/models/issue.js

@@ -7,8 +7,6 @@ class ListIssueEE extends ListIssue {
       IssueProject,
     });
 
-    this.isFetching.weight = true;
-    this.isLoading.weight = false;
     this.weight = obj.weight;
 
     if (obj.project) {

ee/changelogs/unreleased/show-weight-on-new-board-issue.yml

+---
+title: Show weight on new board issue
+merge_request: 16028
+author: Lee Tickett
+type: fixed

spec/javascripts/boards/board_new_issue_spec.js

@@ -171,6 +171,32 @@ describe('Issue boards new issue form', () => {
         .then(done)
         .catch(done.fail);
     });
+
+    it('sets detail weight after submit', done => {
+      boardsStore.weightFeatureAvailable = true;
+      vm.title = 'submit issue';
+
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
+          expect(boardsStore.detail.list.weight).toBe(list.weight);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('does not set detail weight after submit', done => {
+      boardsStore.weightFeatureAvailable = false;
+      vm.title = 'submit issue';
+
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
+          expect(boardsStore.detail.list.weight).toBe(list.weight);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
   });
 
   describe('submit error', () => {

spec/javascripts/boards/mock_data.js

@@ -12,6 +12,7 @@ export const listObj = {
   position: 0,
   title: 'Test',
   list_type: 'label',
+  weight: 3,
   label: {
     id: 5000,
     title: 'Testing',
@@ -26,6 +27,7 @@ export const listObjDuplicate = {
   position: 1,
   title: 'Test',
   list_type: 'label',
+  weight: 3,
   label: {
     id: listObj.label.id,
     title: 'Testing',