diff options
| author | Phil Hughes <me@iamphill.com> | 2018-11-15 15:45:04 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-11-15 15:45:04 +0000 |
| commit | 6c51a6df40d9bc1cb48c7352de5393b787f11d13 (patch) | |
| tree | f057351381d380532f795c21b9896d12fd390988 /app | |
| parent | 84db49ea0c6d18a12efa7268e06d9611ca267fd7 (diff) | |
| parent | f2479e1987304fc7064de4b1f5e72320f958edd7 (diff) | |
| download | gitlab-ce-6c51a6df40d9bc1cb48c7352de5393b787f11d13.tar.gz | |
Merge branch '54021-empty-button' into 'master'
Prevents empty button in jobs empty state
Closes #54021
See merge request gitlab-org/gitlab-ce!23072
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/jobs/store/getters.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/jobs/store/getters.js b/app/assets/javascripts/jobs/store/getters.js index d440b2c9ef1..35e92b0b5d9 100644 --- a/app/assets/javascripts/jobs/store/getters.js +++ b/app/assets/javascripts/jobs/store/getters.js @@ -42,7 +42,7 @@ export const emptyStateIllustration = state => (state.job && state.job.status && state.job.status.illustration) || {}; export const emptyStateAction = state => - (state.job && state.job.status && state.job.status.action) || {}; + (state.job && state.job.status && state.job.status.action) || null; export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete; |