app/controllers/jira_connect/oauth_callbacks_controller.rb

@@ -7,5 +7,7 @@
 class JiraConnect::OauthCallbacksController < ApplicationController
   feature_category :integrations
 
+  skip_before_action :authenticate_user!
+
   def index; end
 end

app/controllers/projects/google_cloud/base_controller.rb

@@ -12,7 +12,7 @@ class Projects::GoogleCloud::BaseController < Projects::ApplicationController
 
   def admin_project_google_cloud!
     unless can?(current_user, :admin_project_google_cloud, project)
-      track_event('admin_project_google_cloud!', 'error_access_denied', 'invalid_user')
+      track_event(:error_invalid_user)
       access_denied!
     end
   end
@@ -20,11 +20,7 @@ def admin_project_google_cloud!
   def google_oauth2_enabled!
     config = Gitlab::Auth::OAuth::Provider.config_for('google_oauth2')
     if config.app_id.blank? || config.app_secret.blank?
-      track_event(
-        'google_oauth2_enabled!',
-        'error_access_denied',
-        { reason: 'google_oauth2_not_configured', config: config }
-      )
+      track_event(:error_google_oauth2_not_enabled)
       access_denied! 'This GitLab instance not configured for Google Oauth2.'
     end
   end
@@ -35,7 +31,7 @@ def feature_flag_enabled!
     enabled_for_project = Feature.enabled?(:incubation_5mp_google_cloud, project)
     feature_is_enabled = enabled_for_user || enabled_for_group || enabled_for_project
     unless feature_is_enabled
-      track_event('feature_flag_enabled!', 'error_access_denied', 'feature_flag_not_enabled')
+      track_event(:error_feature_flag_not_enabled)
       access_denied!
     end
   end
@@ -69,16 +65,14 @@ def expires_at_in_session
     session[GoogleApi::CloudPlatform::Client.session_key_for_expires_at]
   end
 
-  def track_event(action, label, property)
-    options = { label: label, project: project, user: current_user }
-
-    if property.is_a?(String)
-      options[:property] = property
-    else
-      options[:extra] = property
-    end
-
-    Gitlab::Tracking.event('Projects::GoogleCloud', action, **options)
+  def track_event(action, label = nil)
+    Gitlab::Tracking.event(
+      self.class.name,
+      action.to_s,
+      label: label,
+      project: project,
+      user: current_user
+    )
   end
 
   def gcp_projects

app/controllers/projects/google_cloud/configuration_controller.rb

@@ -16,7 +16,7 @@ def index
           revokeOauthUrl: revoke_oauth_url
         }
         @js_data = js_data.to_json
-        track_event('configuration#index', 'success', js_data)
+        track_event(:render_page)
       end
 
       private

app/controllers/projects/google_cloud/databases_controller.rb

@@ -19,7 +19,7 @@ def index
         }
         @js_data = js_data.to_json
 
-        track_event('databases#index', 'success', nil)
+        track_event(:render_page)
       end
 
       def new
@@ -37,6 +37,7 @@ def new
           tiers: Projects::GoogleCloud::CloudsqlHelper::TIERS
         }.to_json
 
+        track_event(:render_form)
         render template: 'projects/google_cloud/databases/cloudsql_form', formats: :html
       end
 
@@ -46,7 +47,7 @@ def create
                             .execute
 
         if enable_response[:status] == :error
-          track_event('databases#cloudsql_create', 'error_enable_cloudsql_service', enable_response)
+          track_event(:error_enable_cloudsql_services)
           flash[:error] = error_message(enable_response[:message])
         else
           permitted_params = params.permit(:gcp_project, :ref, :database_version, :tier)
@@ -55,10 +56,10 @@ def create
                               .execute
 
           if create_response[:status] == :error
-            track_event('databases#cloudsql_create', 'error_create_cloudsql_instance', create_response)
+            track_event(:error_create_cloudsql_instance)
             flash[:warning] = error_message(create_response[:message])
           else
-            track_event('databases#cloudsql_create', 'success', nil)
+            track_event(:create_cloudsql_instance, permitted_params.to_s)
             flash[:notice] = success_message
           end
         end

app/controllers/projects/google_cloud/deployments_controller.rb

@@ -12,7 +12,7 @@ def index
       enableCloudStorageUrl: project_google_cloud_deployments_cloud_storage_path(project)
     }
     @js_data = js_data.to_json
-    track_event('deployments#index', 'success', js_data)
+    track_event(:render_page)
   end
 
   def cloud_run
@@ -21,7 +21,7 @@ def cloud_run
                                   .new(project, current_user, params).execute
 
     if enable_cloud_run_response[:status] == :error
-      track_event('deployments#cloud_run', 'error_enable_cloud_run', enable_cloud_run_response)
+      track_event(:error_enable_services)
       flash[:error] = enable_cloud_run_response[:message]
       redirect_to project_google_cloud_deployments_path(project)
     else
@@ -30,17 +30,17 @@ def cloud_run
                                      .new(project, current_user, params).execute
 
       if generate_pipeline_response[:status] == :error
-        track_event('deployments#cloud_run', 'error_generate_pipeline', generate_pipeline_response)
+        track_event(:error_generate_cloudrun_pipeline)
         flash[:error] = 'Failed to generate pipeline'
         redirect_to project_google_cloud_deployments_path(project)
       else
         cloud_run_mr_params = cloud_run_mr_params(generate_pipeline_response[:branch_name])
-        track_event('deployments#cloud_run', 'success', cloud_run_mr_params)
+        track_event(:generate_cloudrun_pipeline)
         redirect_to project_new_merge_request_path(project, merge_request: cloud_run_mr_params)
       end
     end
-  rescue Google::Apis::ClientError, Google::Apis::ServerError, Google::Apis::AuthorizationError => e
-    track_event('deployments#cloud_run', 'error_gcp', e)
+  rescue Google::Apis::Error => e
+    track_event(:error_google_api)
     flash[:warning] = _('Google Cloud Error - %{error}') % { error: e }
     redirect_to project_google_cloud_deployments_path(project)
   end

app/controllers/projects/google_cloud/gcp_regions_controller.rb

@@ -15,13 +15,13 @@ def index
       cancelPath: project_google_cloud_configuration_path(project)
     }
     @js_data = js_data.to_json
-    track_event('gcp_regions#index', 'success', js_data)
+    track_event(:render_form)
   end
 
   def create
     permitted_params = params.permit(:ref, :gcp_region)
-    response = GoogleCloud::GcpRegionAddOrReplaceService.new(project).execute(permitted_params[:ref], permitted_params[:gcp_region])
-    track_event('gcp_regions#create', 'success', response)
+    GoogleCloud::GcpRegionAddOrReplaceService.new(project).execute(permitted_params[:ref], permitted_params[:gcp_region])
+    track_event(:configure_region)
     redirect_to project_google_cloud_configuration_path(project), notice: _('GCP region configured')
   end
 end

app/controllers/projects/google_cloud/revoke_oauth_controller.rb

@@ -9,10 +9,10 @@ def create
 
     if response.success?
       redirect_message = { notice: s_('GoogleCloud|Google OAuth2 token revocation requested') }
-      track_event('revoke_oauth#create', 'success', response.to_json)
+      track_event(:revoke_oauth)
     else
       redirect_message = { alert: s_('GoogleCloud|Google OAuth2 token revocation request failed') }
-      track_event('revoke_oauth#create', 'error', response.to_json)
+      track_event(:error)
     end
 
     session.delete(GoogleApi::CloudPlatform::Client.session_key_for_token)

app/controllers/projects/google_cloud/service_accounts_controller.rb

@@ -5,7 +5,7 @@ class Projects::GoogleCloud::ServiceAccountsController < Projects::GoogleCloud::
 
   def index
     if gcp_projects.empty?
-      track_event('service_accounts#index', 'error_form', 'no_gcp_projects')
+      track_event(:error_no_gcp_projects)
       flash[:warning] = _('No Google Cloud projects - You need at least one Google Cloud project')
       redirect_to project_google_cloud_configuration_path(project)
     else
@@ -16,10 +16,10 @@ def index
       }
       @js_data = js_data.to_json
 
-      track_event('service_accounts#index', 'success', js_data)
+      track_event(:render_form)
     end
-  rescue Google::Apis::ClientError, Google::Apis::ServerError, Google::Apis::AuthorizationError => e
-    track_event('service_accounts#index', 'error_gcp', e)
+  rescue Google::Apis::Error => e
+    track_event(:error_google_api)
     flash[:warning] = _('Google Cloud Error - %{error}') % { error: e }
     redirect_to project_google_cloud_configuration_path(project)
   end
@@ -35,10 +35,10 @@ def create
       environment_name: permitted_params[:ref]
     ).execute
 
-    track_event('service_accounts#create', 'success', response)
+    track_event(:create_service_account)
     redirect_to project_google_cloud_configuration_path(project), notice: response.message
-  rescue Google::Apis::ClientError, Google::Apis::ServerError, Google::Apis::AuthorizationError => e
-    track_event('service_accounts#create', 'error_gcp', e)
+  rescue Google::Apis::Error => e
+    track_event(:error_google_api)
     flash[:warning] = _('Google Cloud Error - %{error}') % { error: e }
     redirect_to project_google_cloud_configuration_path(project)
   end

app/controllers/projects/incidents_controller.rb

@@ -11,6 +11,7 @@ class Projects::IncidentsController < Projects::ApplicationController
     push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_mvc_2, @project&.work_items_mvc_2_feature_flag_enabled?)
     push_frontend_feature_flag(:work_items_hierarchy, @project)
+    push_frontend_feature_flag(:remove_user_attributes, @group)
   end
 
   feature_category :incident_management

app/controllers/projects/issues_controller.rb

@@ -42,6 +42,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:incident_timeline, project)
+    push_frontend_feature_flag(:remove_user_attributes, @group)
   end
 
   before_action only: [:index, :show] do
@@ -53,6 +54,7 @@ class Projects::IssuesController < Projects::ApplicationController
     push_frontend_feature_flag(:realtime_labels, project)
     push_force_frontend_feature_flag(:work_items_mvc_2, project&.work_items_mvc_2_feature_flag_enabled?)
     push_frontend_feature_flag(:work_items_hierarchy, project)
+    push_frontend_feature_flag(:epic_widget_edit_confirmation, project)
     push_force_frontend_feature_flag(:work_items_create_from_markdown, project&.work_items_create_from_markdown_feature_flag_enabled?)
   end
 

app/controllers/projects/merge_requests_controller.rb

@@ -45,6 +45,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     push_frontend_feature_flag(:paginated_mr_discussions, project)
     push_frontend_feature_flag(:mr_review_submit_comment, project)
     push_frontend_feature_flag(:mr_experience_survey, project)
+    push_frontend_feature_flag(:remove_user_attributes, @group)
   end
 
   before_action do

app/graphql/mutations/releases/create.rb

@@ -32,7 +32,7 @@ class Create < Base
 
       argument :released_at, Types::TimeType,
                required: false,
-               description: 'Date and time for the release. Defaults to the current date and time.'
+               description: 'Date and time for the release. Defaults to the current time. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). Only provide this field if creating an upcoming or historical release.'
 
       argument :milestones, [GraphQL::Types::String],
                required: false,

app/graphql/resolvers/members_resolver.rb

@@ -11,6 +11,10 @@ class MembersResolver < BaseResolver
               required: false,
               description: 'Search query.'
 
+    argument :sort, ::Types::MemberSortEnum,
+              required: false,
+              description: 'sort query.'
+
     def resolve_with_lookahead(**args)
       authorize!(object)
 

app/graphql/types/ci/job_artifact_type.rb

@@ -6,6 +6,9 @@ module Ci
     class JobArtifactType < BaseObject
       graphql_name 'CiJobArtifact'
 
+      field :id, Types::GlobalIDType[::Ci::JobArtifact], null: false,
+                                                         description: 'ID of the artifact.'
+
       field :download_path, GraphQL::Types::String, null: true,
                                                     description: "URL for downloading the artifact's file."
 
@@ -16,6 +19,12 @@ class JobArtifactType < BaseObject
                                            description: 'File name of the artifact.',
                                            method: :filename
 
+      field :size, GraphQL::Types::Int, null: false,
+                                        description: 'Size of the artifact in bytes.'
+
+      field :expire_at, Types::TimeType, null: true,
+                                         description: 'Expiry date of the artifact.'
+
       def download_path
         ::Gitlab::Routing.url_helpers.download_project_job_artifacts_path(
           object.project,

app/graphql/types/ci/runner_membership_filter_enum.rb

@@ -3,15 +3,17 @@
 module Types
   module Ci
     class RunnerMembershipFilterEnum < BaseEnum
-      graphql_name 'RunnerMembershipFilter'
-      description 'Values for filtering runners in namespaces.'
+      graphql_name 'CiRunnerMembershipFilter'
+      description 'Values for filtering runners in namespaces. ' \
+        'The previous type name `RunnerMembershipFilter` was deprecated in 15.4.'
 
       value 'DIRECT',
             description: "Include runners that have a direct relationship.",
             value: :direct
 
       value 'DESCENDANTS',
-            description: "Include runners that have either a direct relationship or a relationship with descendants. These can be project runners or group runners (in the case where group is queried).",
+            description: "Include runners that have either a direct or inherited relationship. " \
+              "These runners can be specific to a project or a group.",
             value: :descendants
     end
   end

app/graphql/types/member_sort_enum.rb

+# frozen_string_literal: true
+
+module Types
+  class MemberSortEnum < SortEnum
+    graphql_name 'MemberSort'
+    description 'Values for sorting members'
+
+    value 'ACCESS_LEVEL_ASC', 'Access level ascending order.', value: :access_level_asc
+    value 'ACCESS_LEVEL_DESC', 'Access level descending order.', value: :access_level_desc
+    value 'USER_FULL_NAME_ASC', "User's full name ascending order.", value: :name_asc
+    value 'USER_FULL_NAME_DESC', "User's full name descending order.", value: :name_desc
+  end
+end

app/graphql/types/project_type.rb

@@ -566,7 +566,7 @@ def container_repositories_count
       project.container_repositories.size
     end
 
-    def ci_config_variables(sha)
+    def ci_config_variables(sha:)
       result = ::Ci::ListConfigVariablesService.new(object, context[:current_user]).execute(sha)
 
       return if result.nil?

app/helpers/application_settings_helper.rb

@@ -7,6 +7,7 @@ module ApplicationSettingsHelper
            :gravatar_enabled?,
            :password_authentication_enabled_for_web?,
            :akismet_enabled?,
+           :spam_check_endpoint_enabled?,
            to: :'Gitlab::CurrentSettings.current_application_settings'
 
   def user_oauth_applications?
@@ -60,6 +61,10 @@ def http_enabled?
     all_protocols_enabled? || Gitlab::CurrentSettings.enabled_git_access_protocol == 'http'
   end
 
+  def anti_spam_service_enabled?
+    akismet_enabled? || spam_check_endpoint_enabled?
+  end
+
   def enabled_protocol_button(container, protocol)
     case protocol
     when 'ssh'

app/helpers/groups_helper.rb

@@ -172,6 +172,15 @@ def subgroups_and_projects_list_app_data(group)
     }
   end
 
+  def group_overview_tabs_app_data(group)
+    {
+      subgroups_and_projects_endpoint: group_children_path(group, format: :json),
+      shared_projects_endpoint: group_shared_projects_path(group, format: :json),
+      archived_projects_endpoint: group_children_path(group, format: :json, archived: 'only'),
+      current_group_visibility: group.visibility
+    }.merge(subgroups_and_projects_list_app_data(group))
+  end
+
   def enabled_git_access_protocol_options_for_group
     case ::Gitlab::CurrentSettings.enabled_git_access_protocol
     when nil, ""

app/helpers/learn_gitlab_helper.rb

@@ -21,7 +21,7 @@ def learn_gitlab_data(project)
   end
 
   def learn_gitlab_onboarding_available?(project)
-    OnboardingProgress.onboarding?(project.namespace) &&
+    Onboarding::Progress.onboarding?(project.namespace) &&
       LearnGitlab::Project.new(current_user).available?
   end
 
@@ -34,7 +34,7 @@ def onboarding_actions_data(project)
       [
         action,
         url: url,
-        completed: attributes[OnboardingProgress.column_name(action)].present?,
+        completed: attributes[Onboarding::Progress.column_name(action)].present?,
         svg: image_path("learn_gitlab/#{action}.svg"),
         enabled: true
       ]
@@ -95,7 +95,7 @@ def learn_gitlab_project
   end
 
   def onboarding_progress(project)
-    OnboardingProgress.find_by(namespace: project.namespace) # rubocop: disable CodeReuse/ActiveRecord
+    Onboarding::Progress.find_by(namespace: project.namespace) # rubocop: disable CodeReuse/ActiveRecord
   end
 end