root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-01-21 21:08:47 +00:00
parent 37a492326e
commit b102159513
22 changed files with 235 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -103,7 +103,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0'
# HAML
gem 'hamlit', '~> 2.11.0'
gem 'hamlit', '~> 2.14.2'
# Files attachments
gem 'carrierwave', '~> 1.3'

4
Gemfile.lock
View File

@ -557,7 +557,7 @@ GEM
rainbow
rubocop (>= 0.50.0)
sysexits (~> 1.1)
hamlit (2.11.0)
hamlit (2.14.2)
temple (>= 0.8.2)
thor
tilt
@ -1388,7 +1388,7 @@ DEPENDENCIES
gssapi
guard-rspec
haml_lint (~> 0.36.0)
hamlit (~> 2.11.0)
hamlit (~> 2.14.2)
hangouts-chat (~> 0.0.5)
hashie
hashie-forbidden_attributes

8
app/assets/javascripts/pipelines/stores/test_reports/actions.js
View File

@ -28,16 +28,12 @@ export const fetchTestSuite = ({ state, commit, dispatch }, index) => {
dispatch('toggleLoading');
const { name = '', build_ids = [] } = state.testReports?.test_suites?.[index] || {};
const { build_ids = [] } = state.testReports?.test_suites?.[index] || {};
// Replacing `/:suite_name.json` with the name of the suite. Including the extra characters
// to ensure that we replace exactly the template part of the URL string
const endpoint = state.suiteEndpoint?.replace(
'/:suite_name.json',
`/${encodeURIComponent(name)}.json`,
);
return axios
.get(endpoint, { params: { build_ids } })
.get(state.suiteEndpoint, { params: { build_ids } })
.then(({ data }) => commit(types.SET_SUITE, { suite: data, index }))
.catch(() => {
createFlash(s__('TestReports|There was an error fetching the test suite.'));

2
app/assets/stylesheets/pages/tree.scss
View File

@ -49,8 +49,6 @@
position: relative;
.dropdown-menu {
min-width: 100%;
width: 100%;
left: inherit;
right: 0;
}

18
app/services/packages/maven/find_or_create_package_service.rb
View File

@ -11,12 +11,7 @@ module Packages
.execute
unless Namespace::PackageSetting.duplicates_allowed?(package)
files = package&.package_files || []
current_maven_files = files.map { |file| extname(file.file_name) }
if current_maven_files.compact.include?(extname(params[:file_name]))
return ServiceResponse.error(message: 'Duplicate package is not allowed')
end
return ServiceResponse.error(message: 'Duplicate package is not allowed') if target_package_is_duplicate?(package)
end
unless package
@ -67,6 +62,17 @@ module Packages
File.extname(filename)
end
def target_package_is_duplicate?(package)
# duplicate metadata files can be uploaded multiple times
return false if package.version.nil?
package
.package_files
.map { |file| extname(file.file_name) }
.compact
.include?(extname(params[:file_name]))
end
end
end
end

36
app/services/system_hooks_service.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
class SystemHooksService
BUILDER_DRIVEN_EVENT_DATA_AVAILABLE_FOR_CLASSES = [GroupMember].freeze
BUILDER_DRIVEN_EVENT_DATA_AVAILABLE_FOR_CLASSES = [GroupMember, Group].freeze
def execute_hooks_for(model, event)
data = build_event_data(model, event)
@ -58,15 +58,6 @@ class SystemHooksService
end
when ProjectMember
data.merge!(project_member_data(model))
when Group
data.merge!(group_data(model))
if event == :rename
data.merge!(
old_path: model.path_before_last_save,
old_full_path: model.full_path_before_last_save
)
end
end
data
@ -114,19 +105,6 @@ class SystemHooksService
}
end
def group_data(model)
owner = model.owner
{
name: model.name,
path: model.path,
full_path: model.full_path,
group_id: model.id,
owner_name: owner.try(:name),
owner_email: owner.try(:email)
}
end
def user_data(model)
{
name: model.name,
@ -141,10 +119,14 @@ class SystemHooksService
end
def builder_driven_event_data(model, event)
case model
when GroupMember
Gitlab::HookData::GroupMemberBuilder.new(model).build(event)
end
builder_class = case model
when GroupMember
Gitlab::HookData::GroupMemberBuilder
when Group
Gitlab::HookData::GroupBuilder
end
builder_class.new(model).build(event)
end
end

2
app/views/projects/pipelines/_with_tabs.html.haml
View File

@ -85,5 +85,5 @@
#js-tab-tests.tab-pane
#js-pipeline-tests-detail{ data: { summary_endpoint: summary_project_pipeline_tests_path(@project, @pipeline, format: :json),
suite_endpoint: project_pipeline_test_path(@project, @pipeline, suite_name: ':suite_name', format: :json) } }
suite_endpoint: project_pipeline_test_path(@project, @pipeline, suite_name: 'suite', format: :json) } }
= render_if_exists "projects/pipelines/tabs_content", pipeline: @pipeline, project: @project

5
changelogs/unreleased/254643-fix-broken-testsuite-link-when-containing-dot.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix broken testsuite link if the suite contains a dot
merge_request: 51828
author: Michael Aigner @tonka3000
type: fixed

6
changelogs/unreleased/276882-Allow-metadata-duplicates.yml Normal file
View File

@ -0,0 +1,6 @@
---
title: Allow versionless maven-metadata.xml file duplicates even when maven duplicates
are disabled
merge_request: 51758
author:
type: fixed

5
changelogs/unreleased/Set-min-width-of-breadcrumb-dropdown-to-200px.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix breadcrumb dropdown on mobile being too narrow
merge_request: 51092
author: Kev @KevSlashNull
type: fixed

5
changelogs/unreleased/sh-update-hamlit-for-gc.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Update hamlit to v2.14.2
merge_request: 52177
author:
type: fixed

8
config/feature_flags/development/whats_new_drawer.yml
View File

@ -1,8 +0,0 @@
---
name: whats_new_drawer
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38975
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254186
milestone: '13.3'
type: development
group: group::retention
default_enabled: false

13
doc/development/snowplow.md
View File

@ -303,11 +303,14 @@ GitLab provides `Gitlab::Tracking`, an interface that wraps the [Snowplow Ruby T
Custom event tracking and instrumentation can be added by directly calling the `GitLab::Tracking.event` class method, which accepts the following arguments:
| argument | type | default value | description |
|:-----------|:-------|:--------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `category` | string | 'application' | Area or aspect of the application. This could be `HealthCheckController` or `Lfs::FileTransformer` for instance. |
| `action` | string | 'generic' | The action being taken, which can be anything from a controller action like `create` to something like an Active Record callback. |
| `data` | object | {} | Additional data such as `label`, `property`, `value`, and `context` as described in [Structured event taxonomy](#structured-event-taxonomy). These are set as empty strings if you don't provide them. |
| argument | type | default value | description |
|------------|---------------------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------|
| `category` | String | | Area or aspect of the application. This could be `HealthCheckController` or `Lfs::FileTransformer` for instance. |
| `action` | String | | The action being taken, which can be anything from a controller action like `create` to something like an Active Record callback. |
| `label` | String | nil | As described in [Structured event taxonomy](#structured-event-taxonomy). |
| `property` | String | nil | As described in [Structured event taxonomy](#structured-event-taxonomy). |
| `value` | Numeric | nil | As described in [Structured event taxonomy](#structured-event-taxonomy). |
| `context` | Array[SelfDescribingJSON] | nil | An array of custom contexts to send with this event. Most events should not have any custom contexts. |
Tracking can be viewed as either tracking user behavior, or can be used for instrumentation to monitor and visualize performance over time in an area or aspect of code.

26
doc/user/packages/nuget_repository/index.md
View File

@ -106,6 +106,9 @@ You can now add a new source to NuGet with:
#### Project-level endpoint
A project-level endpoint is required to publish NuGet packages to the Package Registry.
A project-level endpoint is also required to install NuGet packages from a project.
To use the [project-level](#use-the-gitlab-endpoint-for-nuget-packages) NuGet endpoint, add the Package Registry as a source with `nuget`:
```shell
@ -122,6 +125,8 @@ nuget source Add -Name "GitLab" -Source "https://gitlab.example.com/api/v4/proje
#### Group-level endpoint
To install a NuGet package from a group, use a group-level endpoint.
To use the [group-level](#use-the-gitlab-endpoint-for-nuget-packages) NuGet endpoint, add the Package Registry as a source with `nuget`:
```shell
@ -140,6 +145,9 @@ nuget source Add -Name "GitLab" -Source "https://gitlab.example.com/api/v4/group
#### Project-level endpoint
A project-level endpoint is required to publish NuGet packages to the Package Registry.
A project-level endpoint is also required to install NuGet packages from a project.
To use the [project-level](#use-the-gitlab-endpoint-for-nuget-packages) NuGet endpoint, add the Package Registry as a source with Visual Studio:
1. Open [Visual Studio](https://visualstudio.microsoft.com/vs/).
@ -167,6 +175,8 @@ If you get a warning, ensure that the **Location**, **Username**, and
#### Group-level endpoint
To install a package from a group, use a group-level endpoint.
To use the [group-level](#use-the-gitlab-endpoint-for-nuget-packages) NuGet endpoint, add the Package Registry as a source with Visual Studio:
1. Open [Visual Studio](https://visualstudio.microsoft.com/vs/).
@ -196,6 +206,9 @@ If you get a warning, ensure that the **Location**, **Username**, and
#### Project-level endpoint
A project-level endpoint is required to publish NuGet packages to the Package Registry.
A project-level endpoint is also required to install NuGet packages from a project.
To use the [project-level](#use-the-gitlab-endpoint-for-nuget-packages) Package Registry as a source for .NET:
1. In the root of your project, create a file named `nuget.config`.
@ -219,6 +232,8 @@ To use the [project-level](#use-the-gitlab-endpoint-for-nuget-packages) Package
#### Group-level endpoint
To install a package from a group, use a group-level endpoint.
To use the [group-level](#use-the-gitlab-endpoint-for-nuget-packages) Package Registry as a source for .NET:
1. In the root of your project, create a file named `nuget.config`.
@ -326,8 +341,19 @@ updated:
1. Commit the changes and push it to your GitLab repository to trigger a new CI/CD build.
### Publishing a package with the same name or version
When you publish a package with the same name or version as an existing package,
the existing package is overwritten.
## Install packages
To install a NuGet package from the Package Registry, you must first
[add a project-level or group-level endpoint](#add-the-package-registry-as-a-source-for-nuget-packages).
If multiple packages have the same name and version, when you install
a package, the most recently-published package is retrieved.
### Install a package with the NuGet CLI
WARNING:

6
lib/gitlab/hook_data/base_builder.rb
View File

@ -21,6 +21,12 @@ module Gitlab
private
def event_data(event)
event_name = "#{object.class.name.downcase}_#{event}"
{ event_name: event_name }
end
def timestamps_data
{
created_at: object.created_at&.xmlschema,

57
lib/gitlab/hook_data/group_builder.rb Normal file
View File

@ -0,0 +1,57 @@
# frozen_string_literal: true
module Gitlab
module HookData
class GroupBuilder < BaseBuilder
alias_method :group, :object
# Sample data
# {
# :created_at=>"2021-01-20T09:40:12Z",
# :updated_at=>"2021-01-20T09:40:12Z",
# :event_name=>"group_rename",
# :name=>"group1",
# :path=>"group1",
# :full_path=>"group1",
# :group_id=>1,
# :owner_name=>nil,
# :owner_email=>nil,
# :old_path=>"old-path",
# :old_full_path=>"old-path"
# }
def build(event)
[
timestamps_data,
event_data(event),
group_data,
event_specific_group_data(event)
].reduce(:merge)
end
private
def group_data
owner = group.owner
{
name: group.name,
path: group.path,
full_path: group.full_path,
group_id: group.id,
owner_name: owner.try(:name),
owner_email: owner.try(:email)
}
end
def event_specific_group_data(event)
return {} unless event == :rename
{
old_path: group.path_before_last_save,
old_full_path: group.full_path_before_last_save
}
end
end
end
end

5
spec/frontend/pipelines/test_reports/stores/actions_spec.js
View File

@ -16,7 +16,7 @@ describe('Actions TestReports Store', () => {
const testReports = getJSONFixture('pipelines/test_report.json');
const summary = { total_count: 1 };
const suiteEndpoint = `${TEST_HOST}/tests/:suite_name.json`;
const suiteEndpoint = `${TEST_HOST}/tests/suite.json`;
const summaryEndpoint = `${TEST_HOST}/test_reports/summary.json`;
const defaultState = {
suiteEndpoint,
@ -69,9 +69,8 @@ describe('Actions TestReports Store', () => {
beforeEach(() => {
const buildIds = [1];
testReports.test_suites[0].build_ids = buildIds;
const endpoint = suiteEndpoint.replace(':suite_name', testReports.test_suites[0].name);
mock
.onGet(endpoint, { params: { build_ids: buildIds } })
.onGet(suiteEndpoint, { params: { build_ids: buildIds } })
.replyOnce(200, testReports.test_suites[0], {});
});

71
spec/lib/gitlab/hook_data/group_builder_spec.rb Normal file
View File

@ -0,0 +1,71 @@
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe Gitlab::HookData::GroupBuilder do
let_it_be(:group) { create(:group) }
describe '#build' do
let(:data) { described_class.new(group).build(event) }
let(:event_name) { data[:event_name] }
let(:attributes) do
[
:event_name, :created_at, :updated_at, :name, :path, :full_path, :group_id,
:owner_name, :owner_email
]
end
context 'data' do
shared_examples_for 'includes the required attributes' do
it 'includes the required attributes' do
expect(data).to include(*attributes)
expect(data[:name]).to eq(group.name)
expect(data[:path]).to eq(group.path)
expect(data[:full_path]).to eq(group.full_path)
expect(data[:group_id]).to eq(group.id)
expect(data[:owner_name]).to eq(nil)
expect(data[:owner_email]).to eq(nil)
expect(data[:created_at]).to eq(group.created_at.xmlschema)
expect(data[:updated_at]).to eq(group.updated_at.xmlschema)
end
end
shared_examples_for 'does not include old path attributes' do
it 'does not include old path attributes' do
expect(data).not_to include(:old_path, :old_full_path)
end
end
context 'on create' do
let(:event) { :create }
it { expect(event_name).to eq('group_create') }
it_behaves_like 'includes the required attributes'
it_behaves_like 'does not include old path attributes'
end
context 'on destroy' do
let(:event) { :destroy }
it { expect(event_name).to eq('group_destroy') }
it_behaves_like 'includes the required attributes'
it_behaves_like 'does not include old path attributes'
end
context 'on rename' do
let(:event) { :rename }
it { expect(event_name).to eq('group_rename') }
it_behaves_like 'includes the required attributes'
it 'includes old path details' do
allow(group).to receive(:path_before_last_save).and_return('old-path')
expect(data[:old_path]).to eq(group.path_before_last_save)
expect(data[:old_full_path]).to eq(group.path_before_last_save)
end
end
end
end
end

11
spec/requests/api/maven_packages_spec.rb
View File

@ -32,6 +32,7 @@ RSpec.describe API::MavenPackages do
end
let(:version) { '1.0-SNAPSHOT' }
let(:param_path) { "#{package_name}/#{version}"}
before do
project.add_developer(user)
@ -695,6 +696,14 @@ RSpec.describe API::MavenPackages do
expect(json_response['message']).to include('Duplicate package is not allowed')
end
context 'when uploading to the versionless package which contains metadata about all versions' do
let(:version) { nil }
let(:param_path) { package_name }
let!(:package) { create(:maven_package, project: project, version: version, name: project.full_path) }
it_behaves_like 'storing the package file'
end
context 'when uploading different non-duplicate files to the same package' do
let!(:package) { create(:maven_package, project: project, name: project.full_path) }
@ -744,7 +753,7 @@ RSpec.describe API::MavenPackages do
end
def upload_file(params: {}, request_headers: headers, file_extension: 'jar')
url = "/projects/#{project.id}/packages/maven/#{package_name}/#{version}/my-app-1.0-20180724.124855-1.#{file_extension}"
url = "/projects/#{project.id}/packages/maven/#{param_path}/my-app-1.0-20180724.124855-1.#{file_extension}"
workhorse_finalize(
api(url),
method: :put,

7
spec/services/packages/maven/find_or_create_package_service_spec.rb
View File

@ -111,6 +111,13 @@ RSpec.describe Packages::Maven::FindOrCreatePackageService do
expect(subject.errors).to include('Duplicate package is not allowed')
end
context 'when uploading to the versionless package which contains metadata about all versions' do
let(:version) { nil }
let(:param_path) { path }
it_behaves_like 'reuse existing package'
end
context 'when uploading different non-duplicate files to the same package' do
before do
package_file = existing_package.package_files.find_by(file_name: 'my-app-1.0-20180724.124855-1.jar')

3
spec/services/system_hooks_service_spec.rb
View File

@ -156,9 +156,6 @@ RSpec.describe SystemHooksService do
it { expect(event_name(project_member, :update)).to eq "user_update_for_team" }
it { expect(event_name(key, :create)).to eq 'key_create' }
it { expect(event_name(key, :destroy)).to eq 'key_destroy' }
it { expect(event_name(group, :create)).to eq 'group_create' }
it { expect(event_name(group, :destroy)).to eq 'group_destroy' }
it { expect(event_name(group, :rename)).to eq 'group_rename' }
end
def event_data(*args)

1
tooling/danger/helper.rb
View File

@ -198,7 +198,6 @@ module Tooling
# Files that don't fit into any category are marked with :none
%r{\A(ee/)?changelogs/} => :none,
%r{\Alocale/gitlab\.pot\z} => :none,
%r{\Adata/whats_new/} => :none,
# GraphQL auto generated doc files and schema
%r{\Adoc/api/graphql/reference/} => :backend,