From 676430584d388c5c1a59eec8ab0910ded09c1995 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 23 Jun 2021 15:07:50 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile | 2 +- Gemfile.lock | 20 ++-- .../javascripts/packages/list/constants.js | 4 + .../javascripts/packages/shared/constants.js | 1 + .../javascripts/packages/shared/utils.js | 2 + .../components/editor/ci_editor_header.vue | 38 +++++++ .../components/editor/text_editor.vue | 2 +- .../components/pipeline_editor_tabs.vue | 3 + .../javascripts/pipeline_editor/constants.js | 10 ++ .../components/app_index_apollo_client.vue | 2 +- .../fragments/release.fragment.graphql | 14 +++ .../queries/all_releases.query.graphql | 9 ++ .../components/constants.js | 4 +- .../components/redesigned_app.vue | 57 ++++++---- .../components/section_layout.vue | 6 +- .../releases/all_releases.query.graphql | 105 ++++++++++++++++++ app/helpers/releases_helper.rb | 17 +++ app/models/ci/build.rb | 3 +- app/presenters/ci/build_runner_presenter.rb | 2 +- .../push_options_handler_service.rb | 5 +- app/views/projects/releases/index.html.haml | 2 + .../security/configuration/show.html.haml | 2 + app/workers/concerns/waitable_worker.rb | 4 +- .../development/ci_artifacts_exclude.yml | 8 -- .../metrics/license/20210201124933_uuid.yml | 1 + .../license/20210204124827_hostname.yml | 1 + doc/administration/geo/setup/database.md | 36 +++--- doc/api/award_emoji.md | 4 +- doc/api/boards.md | 4 +- doc/api/graphql/sample_issue_boards.md | 4 +- doc/api/group_boards.md | 6 +- doc/api/group_labels.md | 6 +- doc/api/group_milestones.md | 6 +- doc/api/issues.md | 4 +- doc/api/issues_statistics.md | 4 +- doc/api/labels.md | 4 +- doc/api/milestones.md | 4 +- doc/api/notification_settings.md | 18 ++- doc/api/projects.md | 4 +- doc/api/resource_milestone_events.md | 6 +- doc/api/resource_state_events.md | 2 +- doc/api/resource_weight_events.md | 2 +- doc/api/todos.md | 18 +-- doc/development/internal_api.md | 35 +++++- doc/development/usage_ping/index.md | 8 +- .../configuration/index.md | 46 ++++++++ doc/user/group/epics/manage_epics.md | 2 - doc/user/img/todos_add_todo_sidebar.png | Bin 17524 -> 0 bytes doc/user/img/todos_add_todo_sidebar_v14_1.png | Bin 0 -> 6554 bytes doc/user/img/todos_mark_done_sidebar.png | Bin 17619 -> 0 bytes .../img/todos_mark_done_sidebar_v14_1.png | Bin 0 -> 7055 bytes doc/user/project/description_templates.md | 2 +- doc/user/project/import/jira.md | 2 +- .../project/issues/associate_zoom_meeting.md | 2 +- .../project/issues/confidential_issues.md | 6 +- .../project/issues/crosslinking_issues.md | 4 +- .../project/issues/issue_data_and_actions.md | 2 +- doc/user/project/issues/managing_issues.md | 2 +- .../img/status_checks_widget_passed_v14_0.png | Bin 0 -> 12850 bytes .../status_checks_widget_pending_v14_0.png | Bin 0 -> 12735 bytes .../project/merge_requests/status_checks.md | 39 +++++++ doc/user/project/merge_requests/widgets.md | 6 + doc/user/project/time_tracking.md | 4 +- doc/user/todos.md | 12 +- lib/gitlab/ci/config/entry/artifacts.rb | 7 +- lib/gitlab/ci/features.rb | 4 - lib/gitlab/lograge/custom_options.rb | 1 - locale/gitlab.pot | 20 +++- .../releases/user_views_releases_spec.rb | 45 +++----- spec/frontend/packages/shared/utils_spec.js | 1 + .../editor/ci_editor_header_spec.js | 53 +++++++++ .../releases/__snapshots__/util_spec.js.snap | 33 ++++++ .../app_index_apollo_client_spec.js | 2 +- .../components/redesigned_app_spec.js | 37 ++++-- spec/helpers/releases_helper_spec.rb | 38 +++++++ .../gitlab/ci/config/entry/artifacts_spec.rb | 51 ++------- spec/lib/gitlab/ci/yaml_processor_spec.rb | 2 - spec/models/ci/build_spec.rb | 18 +-- .../ci/build_runner_presenter_spec.rb | 30 ++--- .../api/ci/runner/jobs_request_post_spec.rb | 15 +-- .../push_options_handler_service_spec.rb | 36 +++++- spec/workers/concerns/waitable_worker_spec.rb | 6 + 82 files changed, 731 insertions(+), 296 deletions(-) create mode 100644 app/assets/javascripts/pipeline_editor/components/editor/ci_editor_header.vue create mode 100644 app/graphql/queries/releases/all_releases.query.graphql delete mode 100644 config/feature_flags/development/ci_artifacts_exclude.yml delete mode 100644 doc/user/img/todos_add_todo_sidebar.png create mode 100644 doc/user/img/todos_add_todo_sidebar_v14_1.png delete mode 100644 doc/user/img/todos_mark_done_sidebar.png create mode 100644 doc/user/img/todos_mark_done_sidebar_v14_1.png create mode 100644 doc/user/project/merge_requests/img/status_checks_widget_passed_v14_0.png create mode 100644 doc/user/project/merge_requests/img/status_checks_widget_pending_v14_0.png create mode 100644 spec/frontend/pipeline_editor/components/editor/ci_editor_header_spec.js diff --git a/Gemfile b/Gemfile index c55cea60e31..113d40441f3 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.12.1' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-azure-activedirectory-v2', '~> 0.1' +gem 'omniauth-azure-activedirectory-v2', '~> 1.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index dbf4b78a9a2..186f5cf884d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -617,7 +617,7 @@ GEM hana (1.3.6) hangouts-chat (0.0.5) hashdiff (1.0.1) - hashie (3.6.0) + hashie (4.1.0) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (3.0.0) @@ -809,7 +809,7 @@ GEM shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.4) - oauth2 (1.4.4) + oauth2 (1.4.7) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) @@ -832,8 +832,8 @@ GEM train-core wmi-lite (~> 1.0) oj (3.10.6) - omniauth (1.9.0) - hashie (>= 3.4.6, < 3.7.0) + omniauth (1.9.1) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) @@ -843,8 +843,8 @@ GEM omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-activedirectory-v2 (0.1.1) - omniauth-oauth2 + omniauth-azure-activedirectory-v2 (1.0.0) + omniauth-oauth2 (~> 1.7) omniauth-azure-oauth2 (0.0.10) jwt (>= 1.0, < 3.0) omniauth (~> 1.0) @@ -873,9 +873,9 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.6.0) - oauth2 (~> 1.1) - omniauth (~> 1.9) + omniauth-oauth2 (1.7.1) + oauth2 (~> 1.4) + omniauth (>= 1.9, < 3) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) omniauth-salesforce (1.0.5) @@ -1566,7 +1566,7 @@ DEPENDENCIES omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) - omniauth-azure-activedirectory-v2 (~> 0.1) + omniauth-azure-activedirectory-v2 (~> 1.0) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) diff --git a/app/assets/javascripts/packages/list/constants.js b/app/assets/javascripts/packages/list/constants.js index d871c2e4d24..f2125034b5f 100644 --- a/app/assets/javascripts/packages/list/constants.js +++ b/app/assets/javascripts/packages/list/constants.js @@ -86,6 +86,10 @@ export const PACKAGE_TYPES = [ title: s__('PackageRegistry|RubyGems'), type: PackageType.RUBYGEMS, }, + { + title: s__('PackageRegistry|Debian'), + type: PackageType.DEBIAN, + }, ]; export const LIST_TITLE_TEXT = s__('PackageRegistry|Package Registry'); diff --git a/app/assets/javascripts/packages/shared/constants.js b/app/assets/javascripts/packages/shared/constants.js index 0ef6a3d0d12..c6b9c8b29de 100644 --- a/app/assets/javascripts/packages/shared/constants.js +++ b/app/assets/javascripts/packages/shared/constants.js @@ -9,6 +9,7 @@ export const PackageType = { COMPOSER: 'composer', RUBYGEMS: 'rubygems', GENERIC: 'generic', + DEBIAN: 'debian', }; // we want this separated from the main dictionary to avoid it being pulled in the search of package diff --git a/app/assets/javascripts/packages/shared/utils.js b/app/assets/javascripts/packages/shared/utils.js index bd35a47ca4d..89b9bd34b08 100644 --- a/app/assets/javascripts/packages/shared/utils.js +++ b/app/assets/javascripts/packages/shared/utils.js @@ -25,6 +25,8 @@ export const getPackageTypeLabel = (packageType) => { return s__('PackageRegistry|Composer'); case PackageType.GENERIC: return s__('PackageRegistry|Generic'); + case PackageType.DEBIAN: + return s__('PackageRegistry|Debian'); default: return null; } diff --git a/app/assets/javascripts/pipeline_editor/components/editor/ci_editor_header.vue b/app/assets/javascripts/pipeline_editor/components/editor/ci_editor_header.vue new file mode 100644 index 00000000000..b4e9ab81d38 --- /dev/null +++ b/app/assets/javascripts/pipeline_editor/components/editor/ci_editor_header.vue @@ -0,0 +1,38 @@ + + + diff --git a/app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue b/app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue index 932f8b41b38..77ede396496 100644 --- a/app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue +++ b/app/assets/javascripts/pipeline_editor/components/editor/text_editor.vue @@ -43,7 +43,7 @@ export default { };