Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 12 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
index 5c390c675fa..66e33a08a12 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
@@ -83,7 +83,7 @@ export default {
           <slot></slot>
           <div
             :class="{
-              'gl-flex-direction-column-reverse gl-md-flex-direction-row gl-flex-wrap gl-justify-content-end': !actions.length,
+              'state-container-action-buttons gl-flex-direction-column gl-flex-wrap gl-justify-content-end': !actions.length,
               'gl-md-pt-0 gl-pt-3': hasActionsSlot,
             }"
             class="gl-display-flex gl-font-size-0 gl-ml-auto gl-gap-3"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/new_ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/new_ready_to_merge.vue
index 0b6aa104181..2db5c71be82 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/new_ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/new_ready_to_merge.vue
@@ -8,7 +8,7 @@ export default {
     canMerge: {
       query: readyToMergeQuery,
       skip() {
-        return !this.mr || !window.gon?.features?.mergeRequestWidgetGraphql;
+        return !this.mr;
       },
       variables() {
         return this.mergeRequestQueryVariables;
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
index 5bc5dd886ff..074758e33b2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
@@ -32,16 +32,6 @@ export default {
     </span>
     <template #actions>
       <gl-button
-        v-if="mr.createIssueToResolveDiscussionsPath"
-        :href="mr.createIssueToResolveDiscussionsPath"
-        class="js-create-issue gl-align-self-start gl-vertical-align-top"
-        size="small"
-        variant="confirm"
-        category="secondary"
-      >
-        {{ s__('mrWidget|Create issue to resolve all threads') }}
-      </gl-button>
-      <gl-button
         data-testid="jump-to-first"
         class="gl-align-self-start gl-vertical-align-top"
         size="small"
@@ -51,6 +41,16 @@ export default {
       >
         {{ s__('mrWidget|Jump to first unresolved thread') }}
       </gl-button>
+      <gl-button
+        v-if="mr.createIssueToResolveDiscussionsPath"
+        :href="mr.createIssueToResolveDiscussionsPath"
+        class="js-create-issue gl-align-self-start gl-vertical-align-top"
+        size="small"
+        variant="confirm"
+        category="secondary"
+      >
+        {{ s__('mrWidget|Create issue to resolve all threads') }}
+      </gl-button>
     </template>
   </state-container>
 </template>