Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
f7ead77657
commit
8f764d21b0
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Add runner information in build web hook event
|
||||
merge_request: 20709
|
||||
author: Gaetan Semet
|
||||
type: added
|
|
@ -0,0 +1,17 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class RenameSoftwareLicensePoliciesApprovalStatusToClassification < ActiveRecord::Migration[5.2]
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
DOWNTIME = false
|
||||
|
||||
disable_ddl_transaction!
|
||||
|
||||
def up
|
||||
rename_column_concurrently :software_license_policies, :approval_status, :classification
|
||||
end
|
||||
|
||||
def down
|
||||
undo_rename_column_concurrently :software_license_policies, :approval_status, :classification
|
||||
end
|
||||
end
|
|
@ -0,0 +1,17 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class CleanupSoftwareLicensePoliciesClassificationRename < ActiveRecord::Migration[5.2]
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
DOWNTIME = false
|
||||
|
||||
disable_ddl_transaction!
|
||||
|
||||
def up
|
||||
cleanup_concurrent_column_rename :software_license_policies, :approval_status, :classification
|
||||
end
|
||||
|
||||
def down
|
||||
undo_cleanup_concurrent_column_rename :software_license_policies, :approval_status, :classification
|
||||
end
|
||||
end
|
|
@ -3673,7 +3673,7 @@ ActiveRecord::Schema.define(version: 2019_12_02_031812) do
|
|||
create_table "software_license_policies", id: :serial, force: :cascade do |t|
|
||||
t.integer "project_id", null: false
|
||||
t.integer "software_license_id", null: false
|
||||
t.integer "approval_status", default: 0, null: false
|
||||
t.integer "classification", default: 0, null: false
|
||||
t.index ["project_id", "software_license_id"], name: "index_software_license_policies_unique_per_project", unique: true
|
||||
t.index ["software_license_id"], name: "index_software_license_policies_on_software_license_id"
|
||||
end
|
||||
|
|
|
@ -1223,6 +1223,7 @@ X-Gitlab-Event: Job Hook
|
|||
"build_duration": null,
|
||||
"build_allow_failure": false,
|
||||
"build_failure_reason": "script_failure",
|
||||
"pipeline_id": 2366,
|
||||
"project_id": 380,
|
||||
"project_name": "gitlab-org/gitlab-test",
|
||||
"user": {
|
||||
|
@ -1248,10 +1249,18 @@ X-Gitlab-Event: Job Hook
|
|||
"git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
|
||||
"git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
|
||||
"visibility_level": 20
|
||||
},
|
||||
"runner": {
|
||||
"active": true,
|
||||
"is_shared": false,
|
||||
"id": 380987,
|
||||
"description": "shared-runners-manager-6.gitlab.com"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Note that `commit.id` is the id of the pipeline, not the id of the commit.
|
||||
|
||||
## Image URL rewriting
|
||||
|
||||
From GitLab 11.2, simple image references are rewritten to use an absolute URL
|
||||
|
|
|
@ -31,6 +31,8 @@ module Gitlab
|
|||
build_duration: build.duration,
|
||||
build_allow_failure: build.allow_failure,
|
||||
build_failure_reason: build.failure_reason,
|
||||
pipeline_id: commit.id,
|
||||
runner: build_runner(build.runner),
|
||||
|
||||
# TODO: do we still need it?
|
||||
project_id: project.id,
|
||||
|
@ -43,6 +45,7 @@ module Gitlab
|
|||
},
|
||||
|
||||
commit: {
|
||||
# note: commit.id is actually the pipeline id
|
||||
id: commit.id,
|
||||
sha: commit.sha,
|
||||
message: commit.git_commit_message,
|
||||
|
@ -75,6 +78,17 @@ module Gitlab
|
|||
author = commit.try(:author)
|
||||
author ? Gitlab::Routing.url_helpers.user_url(author) : "mailto:#{pipeline.git_author_email}"
|
||||
end
|
||||
|
||||
def build_runner(runner)
|
||||
return unless runner
|
||||
|
||||
{
|
||||
id: runner.id,
|
||||
description: runner.description,
|
||||
active: runner.active?,
|
||||
is_shared: runner.instance_type?
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1119,6 +1119,9 @@ msgstr ""
|
|||
msgid "Adds an issue to an epic."
|
||||
msgstr ""
|
||||
|
||||
msgid "Adjust your filters/search criteria above."
|
||||
msgstr ""
|
||||
|
||||
msgid "Admin Area"
|
||||
msgstr ""
|
||||
|
||||
|
@ -5904,9 +5907,6 @@ msgstr ""
|
|||
msgid "Designs"
|
||||
msgstr ""
|
||||
|
||||
msgid "Designs coming soon."
|
||||
msgstr ""
|
||||
|
||||
msgid "Destroy"
|
||||
msgstr ""
|
||||
|
||||
|
@ -9292,6 +9292,9 @@ msgstr ""
|
|||
msgid "If using GitHub, you’ll see pipeline statuses on GitHub for your commits and pull requests. %{more_info_link}"
|
||||
msgstr ""
|
||||
|
||||
msgid "If you believe this may be an error, please refer to the %{linkStart}Geo Troubleshooting%{linkEnd} documentation for more information."
|
||||
msgstr ""
|
||||
|
||||
msgid "If you believe this page to be an error, check out the links below for more information."
|
||||
msgstr ""
|
||||
|
||||
|
@ -10130,12 +10133,21 @@ msgstr ""
|
|||
msgid "Last reply by"
|
||||
msgstr ""
|
||||
|
||||
msgid "Last repository check run"
|
||||
msgstr ""
|
||||
|
||||
msgid "Last seen"
|
||||
msgstr ""
|
||||
|
||||
msgid "Last successful sync"
|
||||
msgstr ""
|
||||
|
||||
msgid "Last successful update"
|
||||
msgstr ""
|
||||
|
||||
msgid "Last time verified"
|
||||
msgstr ""
|
||||
|
||||
msgid "Last update"
|
||||
msgstr ""
|
||||
|
||||
|
@ -11500,6 +11512,9 @@ msgstr ""
|
|||
msgid "No %{providerTitle} repositories found"
|
||||
msgstr ""
|
||||
|
||||
msgid "No Design Repositories match this filter"
|
||||
msgstr ""
|
||||
|
||||
msgid "No Epic"
|
||||
msgstr ""
|
||||
|
||||
|
@ -11692,6 +11707,9 @@ msgstr ""
|
|||
msgid "None"
|
||||
msgstr ""
|
||||
|
||||
msgid "Not Implemented"
|
||||
msgstr ""
|
||||
|
||||
msgid "Not all data has been processed yet, the accuracy of the chart for the selected timeframe is limited."
|
||||
msgstr ""
|
||||
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Gitlab::DataBuilder::Build do
|
||||
let(:build) { create(:ci_build) }
|
||||
let(:runner) { create(:ci_runner, :instance) }
|
||||
let(:build) { create(:ci_build, :running, runner: runner) }
|
||||
|
||||
describe '.build' do
|
||||
let(:data) do
|
||||
|
@ -20,6 +21,10 @@ describe Gitlab::DataBuilder::Build do
|
|||
it { expect(data[:build_failure_reason]).to eq(build.failure_reason) }
|
||||
it { expect(data[:project_id]).to eq(build.project.id) }
|
||||
it { expect(data[:project_name]).to eq(build.project.full_name) }
|
||||
it { expect(data[:pipeline_id]).to eq(build.pipeline.id) }
|
||||
it { expect(data[:commit][:id]).to eq(build.pipeline.id) }
|
||||
it { expect(data[:runner][:id]).to eq(build.runner.id) }
|
||||
it { expect(data[:runner][:description]).to eq(build.runner.description) }
|
||||
|
||||
context 'commit author_url' do
|
||||
context 'when no commit present' do
|
||||
|
|
Loading…
Reference in New Issue