Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/approvals')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue22
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue4
2 files changed, 19 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue
index a5b83167283..386ba2e2d77 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue
@@ -1,6 +1,6 @@
<script>
import { GlButton } from '@gitlab/ui';
-import { deprecatedCreateFlash as createFlash } from '~/flash';
+import createFlash from '~/flash';
import { BV_SHOW_MODAL } from '~/lib/utils/constants';
import { s__ } from '~/locale';
import eventHub from '../../event_hub';
@@ -120,7 +120,11 @@ export default {
.then(() => {
this.fetchingApprovals = false;
})
- .catch(() => createFlash(FETCH_ERROR));
+ .catch(() =>
+ createFlash({
+ message: FETCH_ERROR,
+ }),
+ );
},
methods: {
approve() {
@@ -131,7 +135,10 @@ export default {
this.updateApproval(
() => this.service.approveMergeRequest(),
- () => createFlash(APPROVE_ERROR),
+ () =>
+ createFlash({
+ message: APPROVE_ERROR,
+ }),
);
},
approveWithAuth(data) {
@@ -142,14 +149,19 @@ export default {
this.hasApprovalAuthError = true;
return;
}
- createFlash(APPROVE_ERROR);
+ createFlash({
+ message: APPROVE_ERROR,
+ });
},
);
},
unapprove() {
this.updateApproval(
() => this.service.unapproveMergeRequest(),
- () => createFlash(UNAPPROVE_ERROR),
+ () =>
+ createFlash({
+ message: UNAPPROVE_ERROR,
+ }),
);
},
updateApproval(serviceFn, errFn) {
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue
index 55fa24fb51a..07821b01dd5 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue
@@ -32,9 +32,9 @@ export default {
:href="helpPath"
:title="__('About this feature')"
target="_blank"
- class="d-flex-center pl-1"
+ class="d-flex-center"
>
- <gl-icon name="question" />
+ <gl-icon name="question-o" class="gl-ml-3" />
</gl-link>
</div>
</template>