diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-16 06:13:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-16 06:13:22 +0300 |
commit | 515721527a377de6c6318f788c26c0e090c3ae5e (patch) | |
tree | f8bf8ed15c6750fdc859a5fde833ae11f9a19948 | |
parent | e04431d29efaf17dda9dfbfbd0c5001693b25ee4 (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | app/views/projects/pipelines/show.html.haml | 3 | ||||
-rw-r--r-- | app/views/shared/_registration_features_discovery_message.html.haml | 9 | ||||
-rw-r--r-- | db/migrate/20211214110307_remove_temp_index_from_vulnerability_occurrences.rb | 15 | ||||
-rw-r--r-- | db/schema_migrations/20211214110307 | 1 | ||||
-rw-r--r-- | db/structure.sql | 2 | ||||
-rw-r--r-- | doc/user/group/saml_sso/scim_setup.md | 11 | ||||
-rw-r--r-- | locale/gitlab.pot | 9 |
7 files changed, 39 insertions, 11 deletions
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index c911fc8a203..ac5d34bfd44 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -10,8 +10,7 @@ .js-pipeline-container{ data: { controller_action: "#{controller.action_name}" } } #js-pipeline-header-vue.pipeline-header-container{ data: { full_path: @project.full_path, pipeline_iid: @pipeline.iid, pipeline_id: @pipeline.id, pipelines_path: project_pipelines_path(@project) } } - - if Gitlab.com? && show_cc_validation_alert?(@pipeline) - #js-cc-validation-required-alert + = render_if_exists 'projects/pipelines/cc_validation_required_alert', pipeline: @pipeline - if @pipeline.commit.present? = render "projects/pipelines/info", commit: @pipeline.commit diff --git a/app/views/shared/_registration_features_discovery_message.html.haml b/app/views/shared/_registration_features_discovery_message.html.haml new file mode 100644 index 00000000000..8bcd826d8c0 --- /dev/null +++ b/app/views/shared/_registration_features_discovery_message.html.haml @@ -0,0 +1,9 @@ +- license = local_assigns.fetch(:license) +- registration_features_docs_path = help_page_path('development/service_ping/index.md', anchor: 'registration-features-program') +- service_ping_settings_path = metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings') + +%div + %span= s_('RegistrationFeatures|Want to use this feature for free?') + - if license.present? + = link_to s_('RegistrationFeatures|Enable Service Ping and register for this feature.'), service_ping_settings_path + = sprintf(s_('RegistrationFeatures|Read more about the %{linkStart}Registration Features Program%{linkEnd}.') , { linkStart: "<a href=\"#{registration_features_docs_path}\" target=\"_blank\">", linkEnd: "</a>", }).html_safe diff --git a/db/migrate/20211214110307_remove_temp_index_from_vulnerability_occurrences.rb b/db/migrate/20211214110307_remove_temp_index_from_vulnerability_occurrences.rb new file mode 100644 index 00000000000..99f985d528c --- /dev/null +++ b/db/migrate/20211214110307_remove_temp_index_from_vulnerability_occurrences.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class RemoveTempIndexFromVulnerabilityOccurrences < Gitlab::Database::Migration[1.0] + INDEX_NAME = 'vulnerability_occurrences_location_temp_index' + + disable_ddl_transaction! + + def up + remove_concurrent_index_by_name :vulnerability_occurrences, name: INDEX_NAME + end + + def down + add_concurrent_index :vulnerability_occurrences, :id, where: 'location IS NULL', name: INDEX_NAME + end +end diff --git a/db/schema_migrations/20211214110307 b/db/schema_migrations/20211214110307 new file mode 100644 index 00000000000..6e3101bbe59 --- /dev/null +++ b/db/schema_migrations/20211214110307 @@ -0,0 +1 @@ +a1a6e3c5b4a8f959c55edbb084b37ba555b3977e450a549925de47605638f66e
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index e90d862dfdb..e49124d84aa 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -28156,8 +28156,6 @@ CREATE UNIQUE INDEX vulnerability_feedback_unique_idx ON vulnerability_feedback CREATE UNIQUE INDEX vulnerability_occurrence_pipelines_on_unique_keys ON vulnerability_occurrence_pipelines USING btree (occurrence_id, pipeline_id); -CREATE INDEX vulnerability_occurrences_location_temp_index ON vulnerability_occurrences USING btree (id) WHERE (location IS NULL); - CREATE UNIQUE INDEX work_item_types_namespace_id_and_name_unique ON work_item_types USING btree (namespace_id, btrim(lower(name))); ALTER INDEX analytics_cycle_analytics_issue_stage_events_pkey ATTACH PARTITION gitlab_partitions_static.analytics_cycle_analytics_issue_stage_events_00_pkey; diff --git a/doc/user/group/saml_sso/scim_setup.md b/doc/user/group/saml_sso/scim_setup.md index 2b7d90be631..f17de6dcf8d 100644 --- a/doc/user/group/saml_sso/scim_setup.md +++ b/doc/user/group/saml_sso/scim_setup.md @@ -170,14 +170,11 @@ During provisioning: - Duplicate usernames are also handled, by adding suffix `1` upon user creation. For example, due to already existing `test_user` username, `test_user1` is used. -As long as [Group SAML](index.md) has been configured, existing GitLab.com users can link to their accounts in one of the following ways: +If [Group SAML](index.md) has been configured and you have an existing GitLab.com account, you can link your SCIM and SAML identities: -- By updating their *primary* email address in their GitLab.com user account to match their identity provider's user profile email address. -- By following these steps: - - 1. Sign in to GitLab.com if needed. - 1. In the identity provider's dashboard select the GitLab app or visit the **GitLab single sign-on URL**. - 1. Select the **Authorize**. +1. Update the [primary email](../../profile/index.md#change-your-primary-email) address in your GitLab.com user account to match the + user profile email address in your identity provider. +1. [Link your SAML identity](index.md#linking-saml-to-your-existing-gitlabcom-account). We recommend users do this prior to turning on sync, because while synchronization is active, there may be provisioning errors for existing users. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index eb19ccf6a07..d725ee4d57e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -29040,6 +29040,15 @@ msgstr "" msgid "Registration Features include:" msgstr "" +msgid "RegistrationFeatures|Enable Service Ping and register for this feature." +msgstr "" + +msgid "RegistrationFeatures|Read more about the %{linkStart}Registration Features Program%{linkEnd}." +msgstr "" + +msgid "RegistrationFeatures|Want to use this feature for free?" +msgstr "" + msgid "Registration|Checkout" msgstr "" |