Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
99d074d787
commit
4f6d64e5bd
|
@ -0,0 +1,38 @@
|
||||||
|
<!--
|
||||||
|
## Implementation Issue To-Do list
|
||||||
|
(_NOTE: This section can be removed when the issue is ready for creation_)
|
||||||
|
- [ ] Ensure that issue title is concise yet descriptive
|
||||||
|
- [ ] Add `Frontend :` or `Backend: ` per group [naming conventions](https://about.gitlab.com/handbook/engineering/development/ops/verify/pipeline-authoring/#splitting-issues)
|
||||||
|
- [ ] Ensure the issue containing the feature or change proposal and related discussions is linked as related to this implementation issue.
|
||||||
|
- [ ] Aside from default labeling, please make sure to include relevant labels for `type::`, `workflow::`, and `~frontend`/`~backend` labeling.
|
||||||
|
- [ ] Issues with user-facing changes should include the `~UX` label.
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Summary
|
||||||
|
|
||||||
|
## Proposal
|
||||||
|
|
||||||
|
## Implementation Table
|
||||||
|
|
||||||
|
<!--
|
||||||
|
_NOTE: If the issue is not part of an epic, the implementation table can be removed. If it is part of an epic, make sure that the implementation table below mirrors the corresponding epic's implementation table content._
|
||||||
|
-->
|
||||||
|
|
||||||
|
|
||||||
|
| Group | Issue Link |
|
||||||
|
| ------ | ------ |
|
||||||
|
| ~backend | :point_left: You are here |
|
||||||
|
| ~frontend | [#123123](url) |
|
||||||
|
|
||||||
|
<!--
|
||||||
|
## Documentation
|
||||||
|
|
||||||
|
_NOTE: This section is optional, but can be used for easy access to any relevant documentation URLs._
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Links/References
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/label ~"group::pipeline authoring" ~"Category:Pipeline Authoring" ~"section::ops" ~"devops::verify" ~"workflow::planning breakdown"
|
|
@ -19,6 +19,10 @@ class ProjectSetting < ApplicationRecord
|
||||||
validates :merge_commit_template, length: { maximum: Project::MAX_COMMIT_TEMPLATE_LENGTH }
|
validates :merge_commit_template, length: { maximum: Project::MAX_COMMIT_TEMPLATE_LENGTH }
|
||||||
validates :squash_commit_template, length: { maximum: Project::MAX_COMMIT_TEMPLATE_LENGTH }
|
validates :squash_commit_template, length: { maximum: Project::MAX_COMMIT_TEMPLATE_LENGTH }
|
||||||
|
|
||||||
|
default_value_for(:legacy_open_source_license_available) do
|
||||||
|
Feature.enabled?(:legacy_open_source_license_available, default_enabled: :yaml, type: :ops)
|
||||||
|
end
|
||||||
|
|
||||||
def squash_enabled_by_default?
|
def squash_enabled_by_default?
|
||||||
%w[always default_on].include?(squash_option)
|
%w[always default_on].include?(squash_option)
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
name: legacy_open_source_license_available
|
||||||
|
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79855
|
||||||
|
rollout_issue_url:
|
||||||
|
milestone: '14.8'
|
||||||
|
type: ops
|
||||||
|
group: 'group::authentication and authorization'
|
||||||
|
default_enabled: true
|
|
@ -0,0 +1,9 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class AddLegacyOpenSourceLicenseAvailableToProjectSettings < Gitlab::Database::Migration[1.0]
|
||||||
|
enable_lock_retries!
|
||||||
|
|
||||||
|
def change
|
||||||
|
add_column :project_settings, :legacy_open_source_license_available, :boolean, default: true, null: false
|
||||||
|
end
|
||||||
|
end
|
|
@ -0,0 +1 @@
|
||||||
|
5642cf604a1aaf8bef6098a9918b582e0e336d79ca3b2a005cf90bb8eab0ca13
|
|
@ -18724,6 +18724,7 @@ CREATE TABLE project_settings (
|
||||||
has_shimo boolean DEFAULT false NOT NULL,
|
has_shimo boolean DEFAULT false NOT NULL,
|
||||||
squash_commit_template text,
|
squash_commit_template text,
|
||||||
show_diff_preview_in_email boolean DEFAULT true NOT NULL,
|
show_diff_preview_in_email boolean DEFAULT true NOT NULL,
|
||||||
|
legacy_open_source_license_available boolean DEFAULT true NOT NULL,
|
||||||
CONSTRAINT check_3a03e7557a CHECK ((char_length(previous_default_branch) <= 4096)),
|
CONSTRAINT check_3a03e7557a CHECK ((char_length(previous_default_branch) <= 4096)),
|
||||||
CONSTRAINT check_b09644994b CHECK ((char_length(squash_commit_template) <= 500)),
|
CONSTRAINT check_b09644994b CHECK ((char_length(squash_commit_template) <= 500)),
|
||||||
CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL)),
|
CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL)),
|
||||||
|
|
|
@ -121,7 +121,6 @@ project_feature:
|
||||||
- created_at
|
- created_at
|
||||||
- metrics_dashboard_access_level
|
- metrics_dashboard_access_level
|
||||||
- project_id
|
- project_id
|
||||||
- requirements_access_level
|
|
||||||
- security_and_compliance_access_level
|
- security_and_compliance_access_level
|
||||||
- updated_at
|
- updated_at
|
||||||
computed_attributes:
|
computed_attributes:
|
||||||
|
@ -139,6 +138,7 @@ project_setting:
|
||||||
- has_confluence
|
- has_confluence
|
||||||
- has_shimo
|
- has_shimo
|
||||||
- has_vulnerabilities
|
- has_vulnerabilities
|
||||||
|
- legacy_open_source_license_available
|
||||||
- prevent_merge_without_jira_issue
|
- prevent_merge_without_jira_issue
|
||||||
- warn_about_potentially_unwanted_characters
|
- warn_about_potentially_unwanted_characters
|
||||||
- previous_default_branch
|
- previous_default_branch
|
||||||
|
|
|
@ -2166,6 +2166,7 @@ RSpec.describe API::Projects do
|
||||||
approvals_before_merge
|
approvals_before_merge
|
||||||
compliance_frameworks
|
compliance_frameworks
|
||||||
mirror
|
mirror
|
||||||
|
requirements_access_level
|
||||||
requirements_enabled
|
requirements_enabled
|
||||||
security_and_compliance_enabled
|
security_and_compliance_enabled
|
||||||
issues_template
|
issues_template
|
||||||
|
|
|
@ -45,6 +45,8 @@ module Tooling
|
||||||
%r{\Adoc/.*(\.(md|png|gif|jpg|yml))\z} => :docs,
|
%r{\Adoc/.*(\.(md|png|gif|jpg|yml))\z} => :docs,
|
||||||
%r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs,
|
%r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs,
|
||||||
%r{\Adata/whats_new/} => :docs,
|
%r{\Adata/whats_new/} => :docs,
|
||||||
|
%r{\Adata/deprecations/} => :none,
|
||||||
|
%r{\Adata/removals/} => :none,
|
||||||
|
|
||||||
%r{\A((ee|jh)/)?app/finders/(.+/)?integrations/} => [:integrations_be, :database, :backend],
|
%r{\A((ee|jh)/)?app/finders/(.+/)?integrations/} => [:integrations_be, :database, :backend],
|
||||||
[%r{\A((ee|jh)/)?db/(geo/)?(migrate|post_migrate)/}, %r{(:integrations|:\w+_tracker_data)\b}] => [:integrations_be, :database, :migration],
|
[%r{\A((ee|jh)/)?db/(geo/)?(migrate|post_migrate)/}, %r{(:integrations|:\w+_tracker_data)\b}] => [:integrations_be, :database, :migration],
|
||||||
|
|
Loading…
Reference in New Issue