From 7d8d5a3dab415672a41ab29c3bfa9581f275dc50 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 25 Jan 2022 15:12:32 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../issues/show/components/description.vue | 118 ++++++++++++++++++++- app/assets/javascripts/sidebar/graphql.js | 3 + .../work_items/pages/create_work_item.vue | 46 ++++++-- app/assets/stylesheets/pages/issues.scss | 29 +++++ app/controllers/projects/issues_controller.rb | 1 + app/controllers/registrations_controller.rb | 9 ++ app/graphql/types/ci/runner_status_enum.rb | 12 ++- app/graphql/types/ci/runner_type.rb | 5 +- app/models/ci/namespace_mirror.rb | 4 +- app/models/ci/pipeline.rb | 6 +- app/models/ci/runner.rb | 2 +- app/models/project.rb | 4 + app/presenters/ci/runner_presenter.rb | 4 + app/services/groups/create_service.rb | 11 ++ app/views/layouts/_page.html.haml | 1 + app/views/layouts/header/_default.html.haml | 6 +- 16 files changed, 239 insertions(+), 22 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue index 7be4c13f544..3f42f825866 100644 --- a/app/assets/javascripts/issues/show/components/description.vue +++ b/app/assets/javascripts/issues/show/components/description.vue @@ -1,18 +1,31 @@ @@ -52,18 +75,27 @@ export default { {{ __('Something went wrong when creating a work item. Please try again') }} - -
+ +
- {{ __('Create') }} + {{ s__('WorkItem|Create work item') }} - + {{ __('Cancel') }}
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index d77c8a40a79..6411d5e1000 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -305,3 +305,32 @@ ul.related-merge-requests > li gl-emoji { .issuable-header-slide-leave-to { transform: translateY(-100%); } + +.description.work-items-enabled { + ul.task-list { + > li.task-list-item { + padding-inline-start: 2.25rem; + + .js-add-task { + svg { + visibility: hidden; + } + + &:focus svg { + visibility: visible; + } + } + + > input.task-list-item-checkbox { + left: 0.875rem; + } + + &:hover, + &:focus-within { + .js-add-task svg { + visibility: visible; + } + } + } + } +} diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 785fbdaa611..8b5e9fa8bb9 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -54,6 +54,7 @@ class Projects::IssuesController < Projects::ApplicationController push_frontend_feature_flag(:issue_assignees_widget, @project, default_enabled: :yaml) push_frontend_feature_flag(:paginated_issue_discussions, @project, default_enabled: :yaml) push_frontend_feature_flag(:fix_comment_scroll, @project, default_enabled: :yaml) + push_frontend_feature_flag(:work_items, project, default_enabled: :yaml) end around_action :allow_gitaly_ref_name_caching, only: [:discussions] diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index c1765d367d1..7b688c0ccc2 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -35,6 +35,7 @@ class RegistrationsController < Devise::RegistrationsController persist_accepted_terms_if_required(new_user) set_role_required(new_user) + track_experiment_event(new_user) if pending_approval? NotificationService.new.new_instance_access_request(new_user) @@ -223,6 +224,14 @@ class RegistrationsController < Devise::RegistrationsController def context_user current_user end + + def track_experiment_event(new_user) + # Track signed up event to relate it with click "Sign up" button events from + # the experimental logged out header with marketing links. This allows us to + # have a funnel of visitors clicking on the header and those visitors + # signing up and becoming users + experiment(:logged_out_marketing_header, actor: new_user).track(:signed_up) if new_user.persisted? + end end RegistrationsController.prepend_mod_with('RegistrationsController') diff --git a/app/graphql/types/ci/runner_status_enum.rb b/app/graphql/types/ci/runner_status_enum.rb index dd056191ceb..2e65e2d4e1e 100644 --- a/app/graphql/types/ci/runner_status_enum.rb +++ b/app/graphql/types/ci/runner_status_enum.rb @@ -7,12 +7,20 @@ module Types value 'ACTIVE', description: 'Runner that is not paused.', - deprecated: { reason: 'Use CiRunnerType.active instead', milestone: '14.6' }, + deprecated: { + reason: :renamed, + replacement: 'CiRunner.paused', + milestone: '14.6' + }, value: :active value 'PAUSED', description: 'Runner that is paused.', - deprecated: { reason: 'Use CiRunnerType.active instead', milestone: '14.6' }, + deprecated: { + reason: :renamed, + replacement: 'CiRunner.paused', + milestone: '14.6' + }, value: :paused value 'ONLINE', diff --git a/app/graphql/types/ci/runner_type.rb b/app/graphql/types/ci/runner_type.rb index f4a3379c5ca..e3f04ec5814 100644 --- a/app/graphql/types/ci/runner_type.rb +++ b/app/graphql/types/ci/runner_type.rb @@ -29,7 +29,10 @@ module Types field :access_level, ::Types::Ci::RunnerAccessLevelEnum, null: false, description: 'Access level of the runner.' field :active, GraphQL::Types::Boolean, null: false, - description: 'Indicates the runner is allowed to receive jobs.' + description: 'Indicates the runner is allowed to receive jobs.', + deprecated: { reason: 'Use paused', milestone: '14.8' } + field :paused, GraphQL::Types::Boolean, null: false, + description: 'Indicates the runner is paused and not available to run jobs.' field :status, Types::Ci::RunnerStatusEnum, null: false, diff --git a/app/models/ci/namespace_mirror.rb b/app/models/ci/namespace_mirror.rb index ce3faf3546b..d5cbbb96134 100644 --- a/app/models/ci/namespace_mirror.rb +++ b/app/models/ci/namespace_mirror.rb @@ -6,7 +6,7 @@ module Ci class NamespaceMirror < ApplicationRecord belongs_to :namespace - scope :contains_namespace, -> (id) do + scope :by_group_and_descendants, -> (id) do where('traversal_ids @> ARRAY[?]::int[]', id) end @@ -32,7 +32,7 @@ module Ci private def sync_children_namespaces!(namespace_id, traversal_ids) - contains_namespace(namespace_id) + by_group_and_descendants(namespace_id) .where.not(namespace_id: namespace_id) .update_all( "traversal_ids = ARRAY[#{sanitize_sql(traversal_ids.join(','))}]::int[] || traversal_ids[array_position(traversal_ids, #{sanitize_sql(namespace_id)}) + 1:]" diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 0f09b1b8996..032959c385e 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -1163,7 +1163,11 @@ module Ci end def merge_request? - merge_request_id.present? + if Feature.enabled?(:ci_pipeline_merge_request_presence_check, default_enabled: :yaml) + merge_request_id.present? && merge_request + else + merge_request_id.present? + end end def external_pull_request? diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index e7bc6bffcaf..fc13ebec7c2 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -101,7 +101,7 @@ module Ci } scope :belonging_to_group_or_project_descendants, -> (group_id) { - group_ids = Ci::NamespaceMirror.contains_namespace(group_id).select(:namespace_id) + group_ids = Ci::NamespaceMirror.by_group_and_descendants(group_id).select(:namespace_id) project_ids = Ci::ProjectMirror.by_namespace_id(group_ids).select(:project_id) group_runners = joins(:runner_namespaces).where(ci_runner_namespaces: { namespace_id: group_ids }) diff --git a/app/models/project.rb b/app/models/project.rb index 1070bb6db4f..27ec475cc8b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1519,6 +1519,10 @@ class Project < ApplicationRecord group || namespace.try(:owner) end + def owners + Array.wrap(owner) + end + def first_owner obj = owner diff --git a/app/presenters/ci/runner_presenter.rb b/app/presenters/ci/runner_presenter.rb index ffd826fab64..482534f27b9 100644 --- a/app/presenters/ci/runner_presenter.rb +++ b/app/presenters/ci/runner_presenter.rb @@ -15,5 +15,9 @@ module Ci def executor_name Ci::Runner::EXECUTOR_TYPE_TO_NAMES[executor_type&.to_sym] end + + def paused + !active + end end end diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb index da3cebc2e6d..67cbbaf84f6 100644 --- a/app/services/groups/create_service.rb +++ b/app/services/groups/create_service.rb @@ -61,6 +61,8 @@ module Groups delay = Namespaces::InviteTeamEmailService::DELIVERY_DELAY_IN_MINUTES Namespaces::InviteTeamEmailWorker.perform_in(delay, group.id, current_user.id) end + + track_experiment_event end def remove_unallowed_params @@ -112,6 +114,15 @@ module Groups @group.shared_runners_enabled = @group.parent.shared_runners_enabled @group.allow_descendants_override_disabled_shared_runners = @group.parent.allow_descendants_override_disabled_shared_runners end + + def track_experiment_event + return unless group.persisted? + + # Track namespace created events to relate them with signed up events for + # the same experiment. This will let us associate created namespaces to + # users that signed up from the experimental logged out header. + experiment(:logged_out_marketing_header, actor: current_user).track(:namespace_created, namespace: group) + end end end diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index d6557772241..b7299df1bc1 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -16,6 +16,7 @@ = render "shared/service_ping_consent" = render_two_factor_auth_recovery_settings_check = render_if_exists "layouts/header/ee_subscribable_banner" + = render_if_exists "layouts/header/seats_count_alert" = render_if_exists "shared/namespace_storage_limit_alert" = render_if_exists "shared/namespace_user_cap_reached_alert" = render_if_exists "shared/new_user_signups_cap_reached_alert" diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index d0a06c7d5bf..246a31f86c9 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -139,15 +139,15 @@ - experiment(:logged_out_marketing_header, actor: nil) do |e| - e.candidate do %li.nav-item.gl-display-none.gl-sm-display-block - = link_to _('Sign up now'), new_user_registration_path, class: 'gl-button btn btn-default btn-sign-in' + = link_to _('Sign up now'), new_user_registration_path, class: 'gl-button btn btn-default btn-sign-in', data: { track_action: 'click_button', track_experiment: e.name, track_label: 'sign_up_now' } %li.nav-item.gl-display-none.gl-sm-display-block = link_to _('Login'), new_session_path(:user, redirect_to_referer: 'yes') = render 'layouts/header/sign_in_register_button', class: 'gl-sm-display-none' - e.try(:trial_focused) do %li.nav-item.gl-display-none.gl-sm-display-block - = link_to _('Get a free trial'), 'https://about.gitlab.com/free-trial/', class: 'gl-button btn btn-default btn-sign-in' + = link_to _('Get a free trial'), 'https://about.gitlab.com/free-trial/', class: 'gl-button btn btn-default btn-sign-in', data: { track_action: 'click_button', track_experiment: e.name, track_label: 'get_a_free_trial' } %li.nav-item.gl-display-none.gl-sm-display-block - = link_to _('Sign up'), new_user_registration_path + = link_to _('Sign up'), new_user_registration_path, data: { track_action: 'click_button', track_experiment: e.name, track_label: 'sign_up' } %li.nav-item.gl-display-none.gl-sm-display-block = link_to _('Login'), new_session_path(:user, redirect_to_referer: 'yes') = render 'layouts/header/sign_in_register_button', class: 'gl-sm-display-none' -- cgit v1.2.3