diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-21 18:07:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-21 18:07:30 +0300 |
| commit | f1a1bd96b7dca93886efd2e9cfa881bf4a11c40e (patch) | |
| tree | 6fcfb13e777eb8fed7bac1ab58482e91f3265a40 /app/assets/javascripts/commit_merge_requests.js | |
| parent | d4c968c95c4b966a58d3fe76c25aeb6e97d84925 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/commit_merge_requests.js')
| -rw-r--r-- | app/assets/javascripts/commit_merge_requests.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/commit_merge_requests.js b/app/assets/javascripts/commit_merge_requests.js index e382356841c..b92aab4ac3a 100644 --- a/app/assets/javascripts/commit_merge_requests.js +++ b/app/assets/javascripts/commit_merge_requests.js @@ -1,4 +1,4 @@ -/* global Flash */ +/* global createFlash */ import $ from 'jquery'; import axios from './lib/utils/axios_utils'; @@ -71,5 +71,9 @@ export function fetchCommitMergeRequests() { $container.html($content); }) - .catch(() => Flash(s__('Commits|An error occurred while fetching merge requests data.'))); + .catch(() => + createFlash({ + message: s__('Commits|An error occurred while fetching merge requests data.'), + }), + ); } |