Skip to content

Commit 11438b1

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 09fd08f commit 11438b1

File tree

29 files changed

+104
-304
lines changed

29 files changed

+104
-304
lines changed

‎.gitlab/ci/as-if-jh.gitlab-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ prepare-as-if-jh-branch:
3838
needs:
3939
- add-jh-files
4040
script:
41-
- git checkout -b "${AS_IF_JH_BRANCH}"
42-
- git add ${JH_FILES_TO_COMMIT}
43-
- git commit -m 'Add JH files' # TODO: Mark which SHA we add
4441
# Fetch for the history of the branch so it does not cause the following error:
4542
# ! [remote rejected] ref -> ref (shallow update not allowed)
4643
- git fetch --unshallow --filter=tree:0 origin "${CI_COMMIT_SHA}"
44+
- git checkout -b "${AS_IF_JH_BRANCH}"
45+
- git add ${JH_FILES_TO_COMMIT}
46+
- git commit -m 'Add JH files' # TODO: Mark which SHA we add
4747
- git push -f "${SANDBOX_REPOSITORY}" "${AS_IF_JH_BRANCH}"
4848

4949
start-as-if-jh:

‎.gitlab/ci/package-and-test/main.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include:
88
- local: .gitlab/ci/package-and-test/rules.gitlab-ci.yml
99
- local: .gitlab/ci/package-and-test/variables.gitlab-ci.yml
1010
- project: gitlab-org/quality/pipeline-common
11-
ref: 1.14.1
11+
ref: 2.0.0
1212
file:
1313
- /ci/base.gitlab-ci.yml
1414
- /ci/allure-report.yml
@@ -64,10 +64,10 @@ stages:
6464
QA_CAN_TEST_PRAEFECT: "false"
6565
QA_INTERCEPT_REQUESTS: "true"
6666
QA_RUN_TYPE: e2e-package-and-test
67-
TEST_LICENSE_MODE: $QA_TEST_LICENSE_MODE
6867
EE_LICENSE: $QA_EE_LICENSE
6968
GITHUB_ACCESS_TOKEN: $QA_GITHUB_ACCESS_TOKEN
7069
GITLAB_QA_ADMIN_ACCESS_TOKEN: $QA_ADMIN_ACCESS_TOKEN
70+
GITLAB_LICENSE_MODE: test
7171

7272
# ==========================================
7373
# Prepare stage

‎.gitlab/ci/review-apps/qa.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include:
22
- project: gitlab-org/quality/pipeline-common
3-
ref: 1.14.1
3+
ref: 2.0.0
44
file:
55
- /ci/base.gitlab-ci.yml
66
- /ci/allure-report.yml

‎GITLAB_PAGES_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
daa91577c5add2dd851719bc79eb6d5272f95005
1+
298f8eccf2fcb88280be3ea6ecee81842c1f77d4

‎app/assets/javascripts/integrations/constants.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,21 @@ export const integrationTriggerEvents = {
5858
export const integrationTriggerEventTitles = {
5959
[integrationTriggerEvents.PUSH]: s__('IntegrationEvents|A push is made to the repository'),
6060
[integrationTriggerEvents.ISSUE]: s__(
61-
'IntegrationEvents|An issue is created, updated, or closed',
61+
'IntegrationEvents|An issue is created, closed, or reopened',
6262
),
6363
[integrationTriggerEvents.CONFIDENTIAL_ISSUE]: s__(
64-
'IntegrationEvents|A confidential issue is created, updated, or closed',
64+
'IntegrationEvents|A confidential issue is created, closed, or reopened',
6565
),
6666
[integrationTriggerEvents.MERGE_REQUEST]: s__(
67-
'IntegrationEvents|A merge request is created, updated, or merged',
67+
'IntegrationEvents|A merge request is created, merged, closed, or reopened',
6868
),
69-
[integrationTriggerEvents.NOTE]: s__('IntegrationEvents|A comment is added on an issue'),
69+
[integrationTriggerEvents.NOTE]: s__('IntegrationEvents|A comment is added'),
7070
[integrationTriggerEvents.CONFIDENTIAL_NOTE]: s__(
71-
'IntegrationEvents|A comment is added on a confidential issue',
71+
'IntegrationEvents|An internal note or comment on a confidential issue is added',
72+
),
73+
[integrationTriggerEvents.TAG_PUSH]: s__(
74+
'IntegrationEvents|A tag is pushed to the repository or removed',
7275
),
73-
[integrationTriggerEvents.TAG_PUSH]: s__('IntegrationEvents|A tag is pushed to the repository'),
7476
[integrationTriggerEvents.PIPELINE]: s__('IntegrationEvents|A pipeline status changes'),
7577
[integrationTriggerEvents.WIKI_PAGE]: s__('IntegrationEvents|A wiki page is created or updated'),
7678
[integrationTriggerEvents.DEPLOYMENT]: s__(

‎app/controllers/admin/users_controller.rb

-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ class Admin::UsersController < Admin::ApplicationController
77
before_action :user, except: [:index, :new, :create]
88
before_action :check_impersonation_availability, only: :impersonate
99
before_action :ensure_destroy_prerequisites_met, only: [:destroy]
10-
before_action :check_ban_user_feature_flag, only: [:ban]
1110

1211
feature_category :user_management
1312

@@ -378,10 +377,6 @@ def check_impersonation_availability
378377
access_denied! unless Gitlab.config.gitlab.impersonation_enabled
379378
end
380379

381-
def check_ban_user_feature_flag
382-
access_denied! unless Feature.enabled?(:ban_user_feature_flag)
383-
end
384-
385380
def log_impersonation_event
386381
Gitlab::AppLogger.info(format(_("User %{current_user_username} has started impersonating %{username}"), current_user_username: current_user.username, username: user.username))
387382
end

‎app/controllers/whats_new_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class WhatsNewController < ApplicationController
88
before_action :check_whats_new_enabled
99
before_action :check_valid_page_param, :set_pagination_headers
1010

11-
feature_category :navigation
11+
feature_category :onboarding
1212
urgency :low
1313

1414
def index

‎app/graphql/types/issue_type.rb

+4-10
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,14 @@ class IssueType < BaseObject
5454
description: 'Indicates the issue is confidential.'
5555
field :discussion_locked, GraphQL::Types::Boolean, null: false,
5656
description: 'Indicates discussion is locked on the issue.'
57-
field :due_date, Types::TimeType, null: true,
58-
description: 'Due date of the issue.'
59-
field :hidden, GraphQL::Types::Boolean, null: true, resolver_method: :hidden?,
60-
description: 'Indicates the issue is hidden because the author has been banned. ' \
61-
'Will always return `null` if `ban_user_feature_flag` feature flag is disabled.'
62-
6357
field :downvotes, GraphQL::Types::Int,
6458
null: false,
6559
description: 'Number of downvotes the issue has received.',
6660
resolver: Resolvers::DownVotesCountResolver
61+
field :due_date, Types::TimeType, null: true,
62+
description: 'Due date of the issue.'
63+
field :hidden, GraphQL::Types::Boolean, null: true,
64+
description: 'Indicates the issue is hidden because the author has been banned.', method: :hidden?
6765
field :merge_requests_count, GraphQL::Types::Int, null: false,
6866
description: 'Number of merge requests that close the issue on merge.',
6967
resolver: Resolvers::MergeRequestsCountResolver
@@ -190,10 +188,6 @@ def create_note_email
190188
object.creatable_note_email_address(context[:current_user])
191189
end
192190

193-
def hidden?
194-
object.hidden? if Feature.enabled?(:ban_user_feature_flag)
195-
end
196-
197191
def escalation_status
198192
object.supports_escalation? ? object.escalation_status&.status_name : nil
199193
end

‎app/helpers/admin/user_actions_helper.rb

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def delete_actions
5555
end
5656

5757
def ban_actions
58-
return unless ban_feature_available?
5958
return if @user.internal?
6059

6160
if @user.banned?

‎app/helpers/issues_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def confidential_icon(issue)
5757
end
5858

5959
def issue_hidden?(issue)
60-
Feature.enabled?(:ban_user_feature_flag) && issue.hidden?
60+
issue.hidden?
6161
end
6262

6363
def hidden_issue_icon(issue)

‎app/helpers/users_helper.rb

-4
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@ def can_force_email_confirmation?(user)
120120
!user.confirmed?
121121
end
122122

123-
def ban_feature_available?
124-
Feature.enabled?(:ban_user_feature_flag)
125-
end
126-
127123
def confirm_user_data(user)
128124
message = if user.unconfirmed_email.present?
129125
_('This user has an unconfirmed email address (%{email}). You may force a confirmation.') % { email: user.unconfirmed_email }

‎app/models/issue.rb

+1-5
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,7 @@ def most_recent
181181
scope :confidential_only, -> { where(confidential: true) }
182182

183183
scope :without_hidden, -> {
184-
if Feature.enabled?(:ban_user_feature_flag)
185-
where('NOT EXISTS (?)', Users::BannedUser.select(1).where('issues.author_id = banned_users.user_id'))
186-
else
187-
all
188-
end
184+
where.not(author_id: Users::BannedUser.select(:user_id))
189185
}
190186

191187
scope :counts_by_state, -> { reorder(nil).group(:state_id).count }

‎app/views/admin/users/_users.html.haml

+3-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232
= gl_tab_link_to admin_users_path(filter: "blocked"), { item_active: active_when(params[:filter] == 'blocked'), class: 'gl-border-0!' } do
3333
= s_('AdminUsers|Blocked')
3434
= gl_tab_counter_badge(limited_counter_with_delimiter(User.blocked))
35-
- if ban_feature_available?
36-
= gl_tab_link_to admin_users_path(filter: "banned"), { item_active: active_when(params[:filter] == 'banned'), class: 'gl-border-0!' } do
37-
= s_('AdminUsers|Banned')
38-
= gl_tab_counter_badge(limited_counter_with_delimiter(User.banned))
35+
= gl_tab_link_to admin_users_path(filter: "banned"), { item_active: active_when(params[:filter] == 'banned'), class: 'gl-border-0!' } do
36+
= s_('AdminUsers|Banned')
37+
= gl_tab_counter_badge(limited_counter_with_delimiter(User.banned))
3938
= gl_tab_link_to admin_users_path(filter: "blocked_pending_approval"), { item_active: active_when(params[:filter] == 'blocked_pending_approval'), class: 'filter-blocked-pending-approval gl-border-0!', data: { qa_selector: 'pending_approval_tab' } } do
4039
= s_('AdminUsers|Pending approval')
4140
= gl_tab_counter_badge(limited_counter_with_delimiter(User.blocked_pending_approval))

‎config/feature_flags/development/ban_user_feature_flag.yml

-8
This file was deleted.

‎data/deprecations/15-7-deprecate-gitlab-runner-exec-cmd.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
- title: "The `gitlab-runner exec` command is deprecated" # (required) The name of the feature to be deprecated
22
announcement_milestone: "15.7" # (required) The milestone when this feature was first announced as deprecated.
3-
removal_milestone: "16.0" # (required) The milestone when this feature is planned to be removed
3+
removal_milestone: "17.0" # (required) The milestone when this feature is planned to be removed
44
breaking_change: true # (required) If this deprecation is a breaking change, set this value to true
55
reporter: DarrenEastman # (required) GitLab username of the person reporting the deprecation
66
stage: Verify # (required) String value of the stage that the feature was created in. e.g., Growth
77
issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385235 # (required) Link to the deprecation issue in GitLab
88
body: | # (required) Do not modify this line, instead modify the lines below.
99
The [`gitlab-runner exec`](https://docs.gitlab.com/runner/commands/#gitlab-runner-exec) command is deprecated and will be fully removed from GitLab Runner in 16.0. The `gitlab-runner exec` feature was initially developed to provide the ability to validate a GitLab CI pipeline on a local system without needing to commit the updates to a GitLab instance. However, with the continued evolution of GitLab CI, replicating all GitLab CI features into `gitlab-runner exec` was no longer viable. Pipeline syntax and validation [simulation](https://docs.gitlab.com/ee/ci/pipeline_editor/#simulate-a-cicd-pipeline) are available in the GitLab pipeline editor.
10-
end_of_support_milestone: "16.0" # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
10+
end_of_support_milestone: "17.0" # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
1111

1212

1313
# OTHER OPTIONAL FIELDS

‎doc/api/graphql/reference/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13202,7 +13202,7 @@ Relationship between an epic and an issue.
1320213202
| <a id="epicissueescalationstatus"></a>`escalationStatus` | [`IssueEscalationStatus`](#issueescalationstatus) | Escalation status of the issue. |
1320313203
| <a id="epicissuehasepic"></a>`hasEpic` | [`Boolean!`](#boolean) | Indicates if the issue belongs to an epic. Can return true and not show an associated epic when the user has no access to the epic. |
1320413204
| <a id="epicissuehealthstatus"></a>`healthStatus` | [`HealthStatus`](#healthstatus) | Current health status. |
13205-
| <a id="epicissuehidden"></a>`hidden` | [`Boolean`](#boolean) | Indicates the issue is hidden because the author has been banned. Will always return `null` if `ban_user_feature_flag` feature flag is disabled. |
13205+
| <a id="epicissuehidden"></a>`hidden` | [`Boolean`](#boolean) | Indicates the issue is hidden because the author has been banned. |
1320613206
| <a id="epicissuehumantimeestimate"></a>`humanTimeEstimate` | [`String`](#string) | Human-readable time estimate of the issue. |
1320713207
| <a id="epicissuehumantotaltimespent"></a>`humanTotalTimeSpent` | [`String`](#string) | Human-readable total time reported as spent on the issue. |
1320813208
| <a id="epicissueid"></a>`id` | [`ID`](#id) | Global ID of the epic-issue relation. |
@@ -14948,7 +14948,7 @@ Describes an issuable resource link for incident issues.
1494814948
| <a id="issueescalationstatus"></a>`escalationStatus` | [`IssueEscalationStatus`](#issueescalationstatus) | Escalation status of the issue. |
1494914949
| <a id="issuehasepic"></a>`hasEpic` | [`Boolean!`](#boolean) | Indicates if the issue belongs to an epic. Can return true and not show an associated epic when the user has no access to the epic. |
1495014950
| <a id="issuehealthstatus"></a>`healthStatus` | [`HealthStatus`](#healthstatus) | Current health status. |
14951-
| <a id="issuehidden"></a>`hidden` | [`Boolean`](#boolean) | Indicates the issue is hidden because the author has been banned. Will always return `null` if `ban_user_feature_flag` feature flag is disabled. |
14951+
| <a id="issuehidden"></a>`hidden` | [`Boolean`](#boolean) | Indicates the issue is hidden because the author has been banned. |
1495214952
| <a id="issuehumantimeestimate"></a>`humanTimeEstimate` | [`String`](#string) | Human-readable time estimate of the issue. |
1495314953
| <a id="issuehumantotaltimespent"></a>`humanTotalTimeSpent` | [`String`](#string) | Human-readable total time reported as spent on the issue. |
1495414954
| <a id="issueid"></a>`id` | [`ID!`](#id) | ID of the issue. |

‎doc/update/deprecations.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -842,12 +842,12 @@ The [Phabricator task importer](https://docs.gitlab.com/ee/user/project/import/p
842842

843843
</div>
844844

845-
<div class="deprecation removal-160 breaking-change">
845+
<div class="deprecation removal-170 breaking-change">
846846

847847
### The `gitlab-runner exec` command is deprecated
848848

849-
End of Support: GitLab <span class="removal-milestone">16.0</span> <span class="support-end-date"></span><br />
850-
Planned removal: GitLab <span class="removal-milestone">16.0</span> <span class="removal-date"></span>
849+
End of Support: GitLab <span class="removal-milestone">17.0</span> <span class="support-end-date"></span><br />
850+
Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
851851

852852
WARNING:
853853
This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).

‎doc/user/admin_area/moderate_users.md

-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ Users can also be activated using the [GitLab API](../../api/users.md#activate-u
220220
221221
FLAG:
222222
On self-managed GitLab, by default this feature is available.
223-
To hide the feature, ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `ban_user_feature_flag`.
224223
On GitLab.com, this feature is available to GitLab.com administrators only.
225224

226225
GitLab administrators can ban and unban users. Banned users are blocked, and their issues and merge requests are hidden.

0 commit comments

Comments
 (0)