Skip to content

G
gitlab-ce
Commit 7bdb50d8 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Fixes conflicts for app/assets/javascripts/jobs/store/getters.js

parent d2721fcc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/jobs/store/getters.js
View file @ 7bdb50d8
...@@ -51,7 +51,6 @@ export const isJobStuck = state => ...@@ -51,7 +51,6 @@ export const isJobStuck = state =>
(!_.isEmpty(state.job.status) && state.job.status.group === 'pending') && (!_.isEmpty(state.job.status) && state.job.status.group === 'pending') &&
(!_.isEmpty(state.job.runners) && state.job.runners.available === false); (!_.isEmpty(state.job.runners) && state.job.runners.available === false);
<<<<<<< HEAD
// ee-only start // ee-only start
/** /**
* Shared runners limit is only rendered when * Shared runners limit is only rendered when
...@@ -65,8 +64,6 @@ export const shouldRenderSharedRunnerLimitWarning = state => ...@@ -65,8 +64,6 @@ export const shouldRenderSharedRunnerLimitWarning = state =>
state.job.runners.quota.used >= state.job.runners.quota.limit; state.job.runners.quota.used >= state.job.runners.quota.limit;
// ee-only end // ee-only end
=======
>>>>>>> upstream/master
export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete; export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete;
// prevent babel-plugin-rewire from generating an invalid default during karma tests // prevent babel-plugin-rewire from generating an invalid default during karma tests
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7