Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
e23c409e66
commit
b6abc9850e
|
@ -1,9 +1,7 @@
|
|||
---
|
||||
# Cop supports --auto-correct.
|
||||
Style/AccessorGrouping:
|
||||
# Offense count: 254
|
||||
# Temporarily disabled due to too many offenses
|
||||
Enabled: false
|
||||
Details: grace period
|
||||
Exclude:
|
||||
- 'app/finders/template_finder.rb'
|
||||
- 'app/models/commit.rb'
|
||||
|
@ -23,7 +21,6 @@ Style/AccessorGrouping:
|
|||
- 'app/models/project.rb'
|
||||
- 'app/services/deployments/update_environment_service.rb'
|
||||
- 'app/services/issues/clone_service.rb'
|
||||
- 'app/services/merge_requests/bulk_remove_attention_requested_service.rb'
|
||||
- 'app/services/note_summary.rb'
|
||||
- 'app/services/notification_recipients/builder/default.rb'
|
||||
- 'app/services/task_list_toggle_service.rb'
|
||||
|
@ -38,6 +35,7 @@ Style/AccessorGrouping:
|
|||
- 'ee/lib/gitlab/ci/reports/security/locations/dast.rb'
|
||||
- 'ee/lib/gitlab/ci/reports/security/locations/dependency_scanning.rb'
|
||||
- 'lib/feature/definition.rb'
|
||||
- 'lib/gitlab/audit/type/definition.rb'
|
||||
- 'lib/gitlab/bitbucket_server_import/importer.rb'
|
||||
- 'lib/gitlab/ci/config/external/context.rb'
|
||||
- 'lib/gitlab/ci/reports/security/finding.rb'
|
||||
|
@ -65,7 +63,6 @@ Style/AccessorGrouping:
|
|||
- 'lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb'
|
||||
- 'lib/gitlab/suggestions/file_suggestion.rb'
|
||||
- 'lib/gitlab/tracking/event_definition.rb'
|
||||
- 'lib/gitlab/tree_summary.rb'
|
||||
- 'lib/gitlab/usage/metric_definition.rb'
|
||||
- 'lib/gitlab/usage/metrics/instrumentations/base_metric.rb'
|
||||
- 'lib/gitlab/usage/service_ping/instrumented_payload.rb'
|
||||
|
|
|
@ -327,10 +327,12 @@ export const filters = {
|
|||
[TOKEN_TYPE_HEALTH]: {
|
||||
[API_PARAM]: {
|
||||
[NORMAL_FILTER]: 'healthStatus',
|
||||
[SPECIAL_FILTER]: 'healthStatus',
|
||||
},
|
||||
[URL_PARAM]: {
|
||||
[OPERATOR_IS]: {
|
||||
[NORMAL_FILTER]: 'health_status',
|
||||
[SPECIAL_FILTER]: 'health_status',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
@ -898,7 +898,9 @@ export default {
|
|||
:help-path="pagesHelpPath"
|
||||
:label="$options.i18n.pagesLabel"
|
||||
:help-text="
|
||||
s__('ProjectSettings|With GitLab Pages you can host your static websites on GitLab.')
|
||||
s__(
|
||||
'ProjectSettings|With GitLab Pages you can host your static websites on GitLab. GitLab Pages uses a caching mechanism for efficiency. Your changes may not take effect until that cache is invalidated, which usually takes less than a minute.',
|
||||
)
|
||||
"
|
||||
>
|
||||
<project-feature-setting
|
||||
|
|
|
@ -287,6 +287,21 @@ module UsersHelper
|
|||
}
|
||||
]
|
||||
end
|
||||
|
||||
# the keys should match the user model defined roles in app/models/user.rb
|
||||
def localized_user_roles
|
||||
{
|
||||
software_developer: s_('User|Software Developer'),
|
||||
development_team_lead: s_('User|Development Team Lead'),
|
||||
devops_engineer: s_('User|Devops Engineer'),
|
||||
systems_administrator: s_('User|Systems Administrator'),
|
||||
security_analyst: s_('User|Security Analyst'),
|
||||
data_analyst: s_('User|Data Analyst'),
|
||||
product_manager: s_('User|Product Manager'),
|
||||
product_designer: s_('User|Product Designer'),
|
||||
other: s_('User|Other')
|
||||
}.with_indifferent_access.freeze
|
||||
end
|
||||
end
|
||||
|
||||
UsersHelper.prepend_mod_with('UsersHelper')
|
||||
|
|
|
@ -32,7 +32,6 @@ class Project < ApplicationRecord
|
|||
include FeatureGate
|
||||
include OptionallySearch
|
||||
include FromUnion
|
||||
include IgnorableColumns
|
||||
include Repositories::CanHousekeepRepository
|
||||
include EachBatch
|
||||
include GitlabRoutingHelper
|
||||
|
@ -49,8 +48,6 @@ class Project < ApplicationRecord
|
|||
BoardLimitExceeded = Class.new(StandardError)
|
||||
ExportLimitExceeded = Class.new(StandardError)
|
||||
|
||||
ignore_columns :build_coverage_regex, remove_after: '2022-10-22', remove_with: '15.5'
|
||||
|
||||
STATISTICS_ATTRIBUTE = 'repositories_count'
|
||||
UNKNOWN_IMPORT_URL = 'http://unknown.git'
|
||||
# Hashed Storage versions handle rolling out new storage to project and dependents models:
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
.row
|
||||
.form-group.col-sm-4
|
||||
= label :user, :role, _('Role')
|
||||
= select :user, :role, ::User.roles.keys.map { |role| [role.titleize, role] }, { selected: @current_user.role }, class: 'form-control'
|
||||
= select :user, :role, ::User.roles.keys.map { |role| [localized_user_roles[role] || role.titleize, role] }, { selected: @current_user.role }, class: 'form-control'
|
||||
|
||||
.row
|
||||
.form-group.col-sm-4
|
||||
|
|
|
@ -2018,6 +2018,8 @@ On each node perform the following:
|
|||
|
||||
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
|
||||
|
||||
1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
|
||||
|
||||
1. If you're [using NFS](#configure-nfs-optional):
|
||||
1. If necessary, install the NFS client utility packages using the following
|
||||
commands:
|
||||
|
|
|
@ -2023,6 +2023,8 @@ On each node perform the following:
|
|||
|
||||
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
|
||||
|
||||
1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
|
||||
|
||||
1. If you're [using NFS](#configure-nfs-optional):
|
||||
1. If necessary, install the NFS client utility packages using the following
|
||||
commands:
|
||||
|
|
|
@ -748,6 +748,8 @@ On each node perform the following:
|
|||
|
||||
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
|
||||
|
||||
1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
|
||||
|
||||
1. Run `sudo gitlab-rake gitlab:gitaly:check` to confirm the node can connect to Gitaly.
|
||||
1. Tail the logs to see the requests:
|
||||
|
||||
|
|
|
@ -1985,7 +1985,10 @@ On each node perform the following:
|
|||
|
||||
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
|
||||
|
||||
1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
|
||||
|
||||
1. Run `sudo gitlab-rake gitlab:gitaly:check` to confirm the node can connect to Gitaly.
|
||||
|
||||
1. Tail the logs to see the requests:
|
||||
|
||||
```shell
|
||||
|
|
|
@ -2040,6 +2040,8 @@ On each node perform the following:
|
|||
|
||||
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
|
||||
|
||||
1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
|
||||
|
||||
1. If you're [using NFS](#configure-nfs-optional):
|
||||
1. If necessary, install the NFS client utility packages using the following
|
||||
commands:
|
||||
|
|
|
@ -1984,6 +1984,8 @@ On each node perform the following:
|
|||
|
||||
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
|
||||
|
||||
1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
|
||||
|
||||
1. Run `sudo gitlab-rake gitlab:gitaly:check` to confirm the node can connect to Gitaly.
|
||||
1. Tail the logs to see the requests:
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
stage: Data Stores
|
||||
group: Memory
|
||||
group: Application Performance
|
||||
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
|
||||
---
|
||||
|
||||
|
|
|
@ -65,6 +65,7 @@ are very appreciative of the work done by translators and proofreaders!
|
|||
- Michael Hahnle - [GitLab](https://gitlab.com/mhah), [Crowdin](https://crowdin.com/profile/mhah)
|
||||
- Katrin Leinweber - [GitLab](https://gitlab.com/katrinleinweber), [Crowdin](https://crowdin.com/profile/katrinleinweber)
|
||||
- Vladislav Wanner - [GitLab](https://gitlab.com/RumBugen), [Crowdin](https://crowdin.com/profile/RumBugen)
|
||||
- Daniel Ziegenberg - [GitLab](https://gitlab.com/ziegenberg), [Crowdin](https://crowdin.com/profile/ziegenberg)
|
||||
- Greek
|
||||
- Proofreaders needed.
|
||||
- Hebrew
|
||||
|
|
|
@ -89,3 +89,17 @@ project, you would do:
|
|||
In GitLab 15.0 the Slack app is updated to [Slack's new granular permissions app model](https://medium.com/slack-developer-blog/more-precision-less-restrictions-a3550006f9c3).
|
||||
|
||||
There is no change in functionality. A reinstall is not required but recommended.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
When you work with the Slack app, the
|
||||
[App Home](https://api.slack.com/start/overview#app_home) might not display properly.
|
||||
As a workaround, ensure your app is up to date.
|
||||
|
||||
To update an existing Slack integration:
|
||||
|
||||
1. Go to your [chat settings](https://gitlab.com/-/profile/chat_names).
|
||||
1. Next to your project, select **Slack application**.
|
||||
1. Select **Reinstall Slack app**.
|
||||
|
||||
Alternatively, you can [configure a new Slack integration](https://about.gitlab.com/solutions/slack/).
|
||||
|
|
|
@ -75,10 +75,6 @@ module Gitlab
|
|||
}
|
||||
end
|
||||
|
||||
def epics_deepest_relationship_level
|
||||
{ epics_deepest_relationship_level: 0 }
|
||||
end
|
||||
|
||||
def topology_usage_data
|
||||
{
|
||||
duration_s: 0,
|
||||
|
|
|
@ -291,14 +291,6 @@ module Gitlab
|
|||
end
|
||||
end
|
||||
|
||||
def epics_deepest_relationship_level
|
||||
with_duration do
|
||||
# rubocop: disable UsageData/LargeTable
|
||||
{ epics_deepest_relationship_level: ::Epic.deepest_relationship_level.to_i }
|
||||
# rubocop: enable UsageData/LargeTable
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def prometheus_client(verify:)
|
||||
|
|
|
@ -31639,7 +31639,7 @@ msgstr ""
|
|||
msgid "ProjectSettings|Wiki"
|
||||
msgstr ""
|
||||
|
||||
msgid "ProjectSettings|With GitLab Pages you can host your static websites on GitLab."
|
||||
msgid "ProjectSettings|With GitLab Pages you can host your static websites on GitLab. GitLab Pages uses a caching mechanism for efficiency. Your changes may not take effect until that cache is invalidated, which usually takes less than a minute."
|
||||
msgstr ""
|
||||
|
||||
msgid "ProjectTemplates|.NET Core"
|
||||
|
@ -43594,6 +43594,33 @@ msgstr ""
|
|||
msgid "UsersSelect|Unassigned"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Data Analyst"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Development Team Lead"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Devops Engineer"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Other"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Product Designer"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Product Manager"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Security Analyst"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Software Developer"
|
||||
msgstr ""
|
||||
|
||||
msgid "User|Systems Administrator"
|
||||
msgstr ""
|
||||
|
||||
msgid "Uses GitLab as an alternative to Sentry."
|
||||
msgstr ""
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ require 'spec_helper'
|
|||
RSpec.describe 'User edit profile' do
|
||||
include Spec::Support::Helpers::Features::NotesHelpers
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let_it_be(:user) { create(:user) }
|
||||
|
||||
before do
|
||||
stub_feature_flags(remove_user_attributes_projects: false)
|
||||
|
@ -456,6 +456,8 @@ RSpec.describe 'User edit profile' do
|
|||
end
|
||||
|
||||
context 'Remove status button' do
|
||||
let(:user) { create(:user) }
|
||||
|
||||
before do
|
||||
user.status = UserStatus.new(message: 'Eating bread', emoji: 'stuffed_flatbread')
|
||||
|
||||
|
@ -497,8 +499,8 @@ RSpec.describe 'User edit profile' do
|
|||
end
|
||||
|
||||
context 'note header' do
|
||||
let(:project) { create(:project_empty_repo, :public) }
|
||||
let(:issue) { create(:issue, project: project) }
|
||||
let_it_be(:project) { create(:project_empty_repo, :public) }
|
||||
let_it_be(:issue) { create(:issue, project: project) }
|
||||
let(:emoji) { "stuffed_flatbread" }
|
||||
|
||||
before do
|
||||
|
|
|
@ -36,4 +36,11 @@ RSpec.describe 'groups/new.html.haml' do
|
|||
expect(rendered).to have_field('Public')
|
||||
end
|
||||
end
|
||||
|
||||
describe 'role field' do
|
||||
it 'does have a default selection' do
|
||||
expect(rendered).to have_content('Role')
|
||||
expect(rendered).to have_select('Role', selected: 'Software Developer')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue