Show timeout information on job's page

2 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20180221022556_add_used_timeout_and_timeout_source_columns_to_ci_builds.rb b/db/migrate/20180221022556_add_used_timeout_and_timeout_source_columns_to_ci_builds.rb
new file mode 100644
index 00000000000..cb8651b1cfd
--- /dev/null
+++ b/db/migrate/20180221022556_add_used_timeout_and_timeout_source_columns_to_ci_builds.rb
@@ -0,0 +1,15 @@
+class AddUsedTimeoutAndTimeoutSourceColumnsToCiBuilds < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    add_column :ci_builds, :used_timeout, :integer
+    add_column :ci_builds, :timeout_source, :string
+  end
+
+  def down
+    remove_column :ci_builds, :used_timeout
+    remove_column :ci_builds, :timeout_source
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 806e829dcbd..61f15944f5a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -311,6 +311,8 @@ ActiveRecord::Schema.define(version: 20180327101207) do
     t.integer "artifacts_metadata_store"
     t.boolean "protected"
     t.integer "failure_reason"
+    t.integer "used_timeout"
+    t.string "timeout_source"
   end
 
   add_index "ci_builds", ["artifacts_expire_at"], name: "index_ci_builds_on_artifacts_expire_at", where: "(artifacts_file <> ''::text)", using: :btree