Merge branch 'mr-widget-approvals-improvement' into 'master'

MRWidget: Remove approved from serializer.

See merge request !1933

app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_rebase.js

@@ -19,6 +19,11 @@ export default {
       isMakingRequest: false,
     };
   },
+  computed: {
+    isApprovalsLeft() {
+      return this.mr.approvals && this.mr.approvalsLeft;
+    },
+  },
   methods: {
     rebase() {
       this.isMakingRequest = true;
@@ -82,7 +87,7 @@ export default {
           <div class="accept-merge-holder clearfix js-toggle-container accept-action">
             <button
               class="btn btn-small btn-reopen btn-success"
-              :disabled="mr.approvalsLeft || isMakingRequest"
+              :disabled="isApprovalsLeft || isMakingRequest"
               @click="rebase">
               <i
                 v-if="isMakingRequest"
@@ -98,7 +103,7 @@ export default {
           </div>
           <div class="mr-info-list">
             <div class="legend"></div>
-            <p v-if="mr.approvalsLeft">
+            <p v-if="isApprovalsLeft">
               Rebasing is disabled until merge request has been approved.
             </p>
           </div>

app/assets/javascripts/vue_merge_request_widget/ee/stores/mr_widget_store.js

@@ -31,7 +31,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
   }
 
   initApprovals(data) {
-    this.isApproved = data.approved || false;
+    this.isApproved = this.isApproved || false;
     this.approvals = this.approvals || null;
     this.approvalsPath = data.approvals_path || this.approvalsPath;
     this.approvalsRequired = Boolean(this.approvalsPath);
@@ -40,7 +40,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
   setApprovals(data) {
     this.approvals = data;
     this.approvalsLeft = !!data.approvals_left;
-    this.isApproved = data.approved || !this.approvalsLeft || false;
+    this.isApproved = !this.approvalsLeft || false;
     this.preventMerge = this.approvalsRequired && this.approvalsLeft;
   }
 }

app/serializers/merge_request_entity.rb

@@ -21,7 +21,6 @@ class MergeRequestEntity < IssuableEntity
   expose :rebase_commit_sha
   expose :rebase_in_progress?, as: :rebase_in_progress
   expose :should_be_rebased?, as: :should_be_rebased
-  expose :approved?, as: :approved
   expose :ff_only_enabled do |merge_request|
     merge_request.project.merge_requests_ff_only_enabled
   end

spec/serializers/merge_request_entity_spec.rb

@@ -51,7 +51,6 @@ describe MergeRequestEntity do
                                ## EE
                                :can_push_to_source_branch, :approvals_before_merge,
                                :squash, :rebase_commit_sha, :rebase_in_progress,
-                               :approved, :should_be_rebased, :rebase_path,
                                :approvals_path, :ff_only_enabled)
   end