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]

app/assets/javascripts/jobs/components/job_app.vue

@@ -81,7 +81,10 @@
         'shouldRenderCalloutMessage',
         'shouldRenderTriggeredLabel',
         'hasEnvironment',
+<<<<<<< HEAD
         'shouldRenderSharedRunnerLimitWarning',
+=======
+>>>>>>> upstream/master
         'hasTrace',
         'emptyStateIllustration',
         'isScrollingDown',

app/assets/javascripts/jobs/store/getters.js

@@ -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;
 

spec/javascripts/jobs/store/getters_spec.js

@@ -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', () => {