Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
3ce9d72ac6
commit
0212a0b681
|
|
@ -1,6 +1,13 @@
|
|||
afedb913baf4203aa688421873fdb9f94649578e:doc/api/users.md:generic-api-key:2201
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:33
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:34
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:35
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:36
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:37
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:38
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:39
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:40
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:40
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:41
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:55
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:generic-api-key:57
|
||||
spec/frontend/lib/utils/secret_detection_spec.js:gitlab-pat:28
|
||||
|
|
@ -1029,7 +1029,6 @@ RSpec/ContextWording:
|
|||
- 'spec/features/admin/admin_disables_git_access_protocol_spec.rb'
|
||||
- 'spec/features/admin/admin_hook_logs_spec.rb'
|
||||
- 'spec/features/admin/admin_hooks_spec.rb'
|
||||
- 'spec/features/admin/admin_jobs_spec.rb'
|
||||
- 'spec/features/admin/admin_mode/login_spec.rb'
|
||||
- 'spec/features/admin/admin_mode_spec.rb'
|
||||
- 'spec/features/admin/admin_settings_spec.rb'
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ query getAllJobs(
|
|||
readBuild
|
||||
readJobArtifacts
|
||||
updateBuild
|
||||
cancelBuild
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module Users
|
||||
class CreditCardValidation < ApplicationRecord
|
||||
class CreditCardValidation < MainClusterwide::ApplicationRecord
|
||||
include IgnorableColumns
|
||||
|
||||
RELEASE_DAY = Date.new(2021, 5, 17)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module Users
|
||||
class PhoneNumberValidation < ApplicationRecord
|
||||
class PhoneNumberValidation < MainClusterwide::ApplicationRecord
|
||||
include IgnorableColumns
|
||||
|
||||
# SMS send attempts subsequent to the first one will have wait times of 1
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_edit_by_web_ide
|
||||
events:
|
||||
- name: g_edit_by_web_ide
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_edit_by_sfe
|
||||
events:
|
||||
- name: g_edit_by_sfe
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_edit_by_snippet_ide
|
||||
events:
|
||||
- name: g_edit_by_snippet_ide
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_title_changed
|
||||
events:
|
||||
- name: g_project_management_issue_title_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_description_changed
|
||||
events:
|
||||
- name: g_project_management_issue_description_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_assignee_changed
|
||||
events:
|
||||
- name: g_project_management_issue_assignee_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_made_confidential
|
||||
events:
|
||||
- name: g_project_management_issue_made_confidential
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_made_visible
|
||||
events:
|
||||
- name: g_project_management_issue_made_visible
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_created
|
||||
events:
|
||||
- name: g_project_management_issue_created
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_closed
|
||||
events:
|
||||
- name: g_project_management_issue_closed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_reopened
|
||||
events:
|
||||
- name: g_project_management_issue_reopened
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_label_changed
|
||||
events:
|
||||
- name: g_project_management_issue_label_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_milestone_changed
|
||||
events:
|
||||
- name: g_project_management_issue_milestone_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_cross_referenced
|
||||
events:
|
||||
- name: g_project_management_issue_cross_referenced
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_moved
|
||||
events:
|
||||
- name: g_project_management_issue_moved
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_related
|
||||
events:
|
||||
- name: g_project_management_issue_related
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_marked_as_duplicate
|
||||
events:
|
||||
- name: g_project_management_issue_marked_as_duplicate
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_locked
|
||||
events:
|
||||
- name: g_project_management_issue_locked
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_unlocked
|
||||
events:
|
||||
- name: g_project_management_issue_unlocked
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_designs_added
|
||||
events:
|
||||
- name: g_project_management_issue_designs_added
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_designs_modified
|
||||
events:
|
||||
- name: g_project_management_issue_designs_modified
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_designs_removed
|
||||
events:
|
||||
- name: g_project_management_issue_designs_removed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_due_date_changed
|
||||
events:
|
||||
- name: g_project_management_issue_due_date_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_time_estimate_changed
|
||||
events:
|
||||
- name: g_project_management_issue_time_estimate_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_time_spent_changed
|
||||
events:
|
||||
- name: g_project_management_issue_time_spent_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_comment_added
|
||||
events:
|
||||
- name: g_project_management_issue_comment_added
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_comment_edited
|
||||
events:
|
||||
- name: g_project_management_issue_comment_edited
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_comment_removed
|
||||
events:
|
||||
- name: g_project_management_issue_comment_removed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 28d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_cloned
|
||||
events:
|
||||
- name: g_project_management_issue_cloned
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -12,9 +12,6 @@ time_frame: 28d
|
|||
data_source: internal_events
|
||||
data_category: optional
|
||||
performance_indicator_type: []
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_design_comments_removed
|
||||
events:
|
||||
- name: g_project_management_issue_design_comments_removed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -11,9 +11,6 @@ milestone: "13.6"
|
|||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_title_changed
|
||||
events:
|
||||
- name: g_project_management_issue_title_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_edit_by_web_ide
|
||||
events:
|
||||
- name: g_edit_by_web_ide
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_edit_by_sfe
|
||||
events:
|
||||
- name: g_edit_by_sfe
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_edit_by_snippet_ide
|
||||
events:
|
||||
- name: g_edit_by_snippet_ide
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_description_changed
|
||||
events:
|
||||
- name: g_project_management_issue_description_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_assignee_changed
|
||||
events:
|
||||
- name: g_project_management_issue_assignee_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_made_confidential
|
||||
events:
|
||||
- name: g_project_management_issue_made_confidential
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_made_visible
|
||||
events:
|
||||
- name: g_project_management_issue_made_visible
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_created
|
||||
events:
|
||||
- name: g_project_management_issue_created
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_closed
|
||||
events:
|
||||
- name: g_project_management_issue_closed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_reopened
|
||||
events:
|
||||
- name: g_project_management_issue_reopened
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_label_changed
|
||||
events:
|
||||
- name: g_project_management_issue_label_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_milestone_changed
|
||||
events:
|
||||
- name: g_project_management_issue_milestone_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_cross_referenced
|
||||
events:
|
||||
- name: g_project_management_issue_cross_referenced
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_moved
|
||||
events:
|
||||
- name: g_project_management_issue_moved
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_related
|
||||
events:
|
||||
- name: g_project_management_issue_related
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_marked_as_duplicate
|
||||
events:
|
||||
- name: g_project_management_issue_marked_as_duplicate
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_locked
|
||||
events:
|
||||
- name: g_project_management_issue_locked
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_designs_added
|
||||
events:
|
||||
- name: g_project_management_issue_designs_added
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_designs_modified
|
||||
events:
|
||||
- name: g_project_management_issue_designs_modified
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_designs_removed
|
||||
events:
|
||||
- name: g_project_management_issue_designs_removed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_due_date_changed
|
||||
events:
|
||||
- name: g_project_management_issue_due_date_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_time_estimate_changed
|
||||
events:
|
||||
- name: g_project_management_issue_time_estimate_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_time_spent_changed
|
||||
events:
|
||||
- name: g_project_management_issue_time_spent_changed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_comment_added
|
||||
events:
|
||||
- name: g_project_management_issue_comment_added
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_comment_edited
|
||||
events:
|
||||
- name: g_project_management_issue_comment_edited
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_comment_removed
|
||||
events:
|
||||
- name: g_project_management_issue_comment_removed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -9,9 +9,6 @@ value_type: number
|
|||
status: active
|
||||
time_frame: 7d
|
||||
data_source: internal_events
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_cloned
|
||||
events:
|
||||
- name: g_project_management_issue_cloned
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -12,9 +12,6 @@ time_frame: 7d
|
|||
data_source: internal_events
|
||||
data_category: optional
|
||||
performance_indicator_type: []
|
||||
options:
|
||||
events:
|
||||
- g_project_management_issue_design_comments_removed
|
||||
events:
|
||||
- name: g_project_management_issue_design_comments_removed
|
||||
unique: user.id
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ feature_categories:
|
|||
description: Stores whether the user has verified their phone number
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97762
|
||||
milestone: '15.5'
|
||||
gitlab_schema: gitlab_main
|
||||
gitlab_schema: gitlab_main_clusterwide
|
||||
|
|
|
|||
|
|
@ -194,6 +194,26 @@ background migration. It also specifies a `belongs_to` relation which
|
|||
will be added to the model to automatically populate the `sharding_key` in
|
||||
the `before_save`.
|
||||
|
||||
##### Defining a `desired_sharding_key` when the parent table also has a `desired_sharding_key`
|
||||
|
||||
By default, a `desired_sharding_key` configuration will validate that the chosen `sharding_key`
|
||||
exists on the parent table. However, if the parent table also has a `desired_sharding_key` configuration
|
||||
and is itself waiting to be backfilled, you need to include the `awaiting_backfill_on_parent` field.
|
||||
For example:
|
||||
|
||||
```yaml
|
||||
desired_sharding_key:
|
||||
project_id:
|
||||
references: projects
|
||||
backfill_via:
|
||||
parent:
|
||||
foreign_key: package_file_id
|
||||
table: packages_package_files
|
||||
sharding_key: project_id
|
||||
belongs_to: package_file
|
||||
awaiting_backfill_on_parent: true
|
||||
```
|
||||
|
||||
There are likely edge cases where this `desired_sharding_key` structure is not
|
||||
suitable for backfilling a `sharding_key`. In such cases the team owning the
|
||||
table will need to create the necessary merge requests to add the
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
|
|||
describe 'GET /admin/jobs' do
|
||||
let(:pipeline) { create(:ci_pipeline) }
|
||||
|
||||
context 'All tab' do
|
||||
context 'when have jobs' do
|
||||
describe '"All" tab' do
|
||||
context 'with jobs' do
|
||||
it 'shows all jobs', :js do
|
||||
create(:ci_build, pipeline: pipeline, status: :pending)
|
||||
create(:ci_build, pipeline: pipeline, status: :running)
|
||||
|
|
@ -27,7 +27,13 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
|
|||
wait_for_requests
|
||||
|
||||
expect(page).to have_selector('[data-testid="jobs-all-tab"]')
|
||||
expect(page.all('[data-testid="jobs-table-row"]').size).to eq(4)
|
||||
|
||||
jobs = page.all('[data-testid="jobs-table-row"]')
|
||||
expect(jobs.size).to eq(4)
|
||||
expect(jobs.at(0)).to have_button('Retry')
|
||||
expect(jobs.at(1)).to have_button('Run again')
|
||||
expect(jobs.at(2)).to have_button('Cancel')
|
||||
expect(jobs.at(3)).to have_button('Cancel')
|
||||
|
||||
click_button 'Cancel all jobs'
|
||||
|
||||
|
|
@ -36,7 +42,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
|
|||
end
|
||||
end
|
||||
|
||||
context 'when have no jobs' do
|
||||
context 'with no jobs' do
|
||||
it 'shows a message' do
|
||||
visit admin_jobs_path
|
||||
|
||||
|
|
@ -49,7 +55,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
|
|||
end
|
||||
end
|
||||
|
||||
context 'Finished tab' do
|
||||
describe '"Finished" tab' do
|
||||
context 'when have finished jobs' do
|
||||
it 'shows finished jobs' do
|
||||
build1 = create(:ci_build, pipeline: pipeline, status: :pending)
|
||||
|
|
@ -72,7 +78,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
|
|||
end
|
||||
end
|
||||
|
||||
context 'when have no jobs finished' do
|
||||
context 'when no jobs have finished' do
|
||||
it 'shows a message' do
|
||||
create(:ci_build, pipeline: pipeline, status: :running)
|
||||
|
||||
|
|
@ -91,7 +97,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
|
|||
end
|
||||
end
|
||||
|
||||
context 'jobs table links' do
|
||||
describe 'jobs table links' do
|
||||
let_it_be(:namespace) { create(:namespace) }
|
||||
let_it_be(:project) { create(:project, namespace: namespace) }
|
||||
let_it_be(:runner) { create(:ci_runner, :instance) }
|
||||
|
|
@ -113,7 +119,7 @@ RSpec.describe 'Admin Jobs', :js, feature_category: :continuous_integration do
|
|||
end
|
||||
end
|
||||
|
||||
context 'job filtering' do
|
||||
describe 'job filtering' do
|
||||
it 'filters jobs by status' do
|
||||
create(:ci_build, pipeline: pipeline, status: :success)
|
||||
create(:ci_build, pipeline: pipeline, status: :failed)
|
||||
|
|
|
|||
|
|
@ -3329,7 +3329,6 @@
|
|||
- './spec/features/admin/admin_health_check_spec.rb'
|
||||
- './spec/features/admin/admin_hook_logs_spec.rb'
|
||||
- './spec/features/admin/admin_hooks_spec.rb'
|
||||
- './spec/features/admin/admin_jobs_spec.rb'
|
||||
- './spec/features/admin/admin_labels_spec.rb'
|
||||
- './spec/features/admin/admin_manage_applications_spec.rb'
|
||||
- './spec/features/admin/admin_mode/login_spec.rb'
|
||||
|
|
|
|||
Loading…
Reference in New Issue