Commit 105e7de5 authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-25

# Conflicts:
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/store/getters.js
#	spec/javascripts/jobs/store/getters_spec.js

[ci skip]
parents b8275cdc 9e6098a6
......@@ -81,7 +81,10 @@
'shouldRenderCalloutMessage',
'shouldRenderTriggeredLabel',
'hasEnvironment',
<<<<<<< HEAD
'shouldRenderSharedRunnerLimitWarning',
=======
>>>>>>> upstream/master
'hasTrace',
'emptyStateIllustration',
'isScrollingDown',
......
......@@ -41,6 +41,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) || {};
<<<<<<< HEAD
// ee-only start
/**
......@@ -54,6 +55,8 @@ export const shouldRenderSharedRunnerLimitWarning = state =>
!_.isEmpty(state.job.runners.quota) &&
state.job.runners.quota.used >= state.job.runners.quota.limit;
// ee-only end
=======
>>>>>>> upstream/master
export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete;
......
......@@ -175,6 +175,7 @@ describe('Job Store Getters', () => {
});
});
<<<<<<< HEAD
describe('shouldRenderSharedRunnerLimitWarning', () => {
describe('without runners information', () => {
it('returns false', () => {
......@@ -230,6 +231,8 @@ describe('Job Store Getters', () => {
});
});
=======
>>>>>>> upstream/master
describe('hasRunnersForProject', () => {
describe('with available and offline runners', () => {
it('returns true', () => {
......
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