Merge branch 'ce-to-ee-2018-04-05' into 'master'

CE upstream - 2018-04-05 05:20 UTC

See merge request gitlab-org/gitlab-ee!5240

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

@@ -45,7 +45,7 @@
         return `#${this.job.runner.id}`;
       },
       hasTimeout() {
-        return this.job.metadata != null && this.job.metadata.timeout_human_readable !== '';
+        return this.job.metadata != null && this.job.metadata.timeout_human_readable !== null;
       },
       timeout() {
         if (this.job.metadata == null) {

app/models/ci/build.rb

@@ -94,6 +94,7 @@ module Ci
     before_save :ensure_token
     before_destroy { unscoped_project }
 
+    before_create :ensure_metadata
     after_create unless: :importing? do |build|
       run_after_commit { BuildHooksWorker.perform_async(build.id) }
     end

app/serializers/build_metadata_entity.rb

 class BuildMetadataEntity < Grape::Entity
-  expose :timeout_human_readable do |metadata|
-    metadata.timeout_human_readable unless metadata.timeout.nil?
-  end
-
+  expose :timeout_human_readable
   expose :timeout_source do |metadata|
     metadata.present.timeout_source
   end

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-04 19:35+0200\n"
-"PO-Revision-Date: 2018-04-04 19:35+0200\n"
+"POT-Creation-Date: 2018-04-05 09:57+0200\n"
+"PO-Revision-Date: 2018-04-05 09:57+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"

spec/factories/ci/build_metadata.rb

-FactoryBot.define do
-  factory :ci_build_metadata, class: Ci::BuildMetadata do
-    build factory: :ci_build
-
-    after(:build) do |build_metadata, _|
-      build_metadata.project ||= build_metadata.build.project
-    end
-  end
-end

spec/models/ci/build_metadata_spec.rb

@@ -13,7 +13,7 @@ describe Ci::BuildMetadata do
   end
 
   let(:build) { create(:ci_build, pipeline: pipeline) }
-  let(:build_metadata) { create(:ci_build_metadata, build: build) }
+  let(:build_metadata) { build.metadata }
 
   describe '#update_timeout_state' do
     subject { build_metadata }