Commit 3b051187 authored by Samantha Ming's avatar Samantha Ming Committed by Phil Hughes
Browse files

Add missing popover & remove text for empty rule 

- Update All Members to be Any eligible user
parent fe12a6d3

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

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ export default class MergeRequestStore { 
    this.conflictsDocsPath = data.conflicts_docs_path;

    this.ciEnvironmentsStatusPath = data.ci_environments_status_path;

    this.securityApprovalsHelpPagePath = data.security_approvals_help_page_path;

    this.eligibleApproversDocsPath = data.eligible_approvers_docs_path;

  }



  get isNothingToMergeState() {

app/views/projects/merge_requests/_widget.html.haml

+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ 
    window.gl.mrWidgetData.squash_before_merge_help_path = '#{help_page_path("user/project/merge_requests/squash_and_merge")}';

    window.gl.mrWidgetData.troubleshooting_docs_path = '#{help_page_path('user/project/merge_requests/index.md', anchor: 'troubleshooting')}';

    window.gl.mrWidgetData.security_approvals_help_page_path = '#{help_page_path('user/application_security/index.html', anchor: 'security-approvals-in-merge-requests-ultimate')}';

    window.gl.mrWidgetData.eligible_approvers_docs_path = '#{help_page_path('user/project/merge_requests/merge_request_approvals', anchor: 'eligible-approvers')}';



#js-vue-mr-widget.mr-widget

changelogs/unreleased/37952-fix-missing-empty-rule-ux-in-mr-widget.yml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
---

title: Resolve Add missing popover and remove none in MR widget

merge_request: 21095

author:

type: other

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ export default { 
      :approval-rules="mr.approvalRules"

      :is-loading-rules="isLoadingRules"

      :security-approvals-help-page-path="mr.securityApprovalsHelpPagePath"

      :eligible-approvers-docs-path="mr.eligibleApproversDocsPath"

    />

  </mr-widget-container>

</template>

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.vue

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ export default { 
      required: false,

      default: '',

    },

    eligibleApproversDocsPath: {

      type: String,

      required: false,

      default: '',

    },

  },

  computed: {

    isCollapsed() {
@@ -84,6 +89,7 @@ export default { 
      <approvals-list

        :approval-rules="approvalRules"

        :security-approvals-help-page-path="securityApprovalsHelpPagePath"

        :eligible-approvers-docs-path="eligibleApproversDocsPath"

      />

    </div>

  </div>