diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index cd72bed8b4b..bf17499bfad 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -6,11 +6,6 @@
- @force_desktop_expanded_sidebar = true
- if can?(current_user, :admin_project, @project)
- = render Pajamas::AlertComponent.new(title: _('GitLab Pages has moved'),
- alert_options: { class: 'gl-my-5 js-hide-when-nothing-matches-search', data: { feature_id: Users::CalloutsHelper::PAGES_MOVED_CALLOUT, dismiss_endpoint: callouts_path, defer_links: 'true' } }) do |c|
- - c.with_body do
- = _('To go to GitLab Pages, on the left sidebar, select %{pages_link}.').html_safe % {pages_link: link_to('Deploy > Pages', project_pages_path(@project)).html_safe}
-
%section.settings.general-settings.no-animate.expanded#js-general-settings
.settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Naming, topics, avatar')
diff --git a/doc/administration/server_hooks.md b/doc/administration/server_hooks.md
index ed066c5daec..743b6c4fae6 100644
--- a/doc/administration/server_hooks.md
+++ b/doc/administration/server_hooks.md
@@ -48,6 +48,7 @@ Prerequisites:
- The [storage name](gitaly/configure_gitaly.md#gitlab-requires-a-default-repository-storage), path to the Gitaly configuration file
(default is `/var/opt/gitlab/gitaly/config.toml` on Linux package instances), and the
[repository relative path](repository_storage_paths.md#from-project-name-to-hashed-path) for the repository.
+- Any language runtimes and utilities that are required by the hooks must be installed on each of the servers that run Gitaly.
To set server hooks for a repository:
diff --git a/doc/security/token_overview.md b/doc/security/token_overview.md
index 9238d4a600c..56585b25ba1 100644
--- a/doc/security/token_overview.md
+++ b/doc/security/token_overview.md
@@ -59,7 +59,7 @@ You can use the [project access tokens API](../api/project_access_tokens.md) to
programmatically take action, such as
[rotating a project access token](../api/project_access_tokens.md#rotate-a-project-access-token).
-Project maintainers receive an email when project access tokens are 7 days or less from expiration.
+Project maintainers with a direct membership receive an email when project access tokens are 7 days or less from expiration. Inherited members do not receive an email.
## Group access tokens
@@ -78,7 +78,7 @@ You can use the [group access tokens API](../api/group_access_tokens.md) to
programmatically take action, such as
[rotating a group access token](../api/group_access_tokens.md#rotate-a-group-access-token).
-All group owners receive an email when group access tokens are 7 days or less from expiration.
+All group owners with a direct membership receive an email when group access tokens are 7 days or less from expiration. Inherited members do not receive an email.
## Deploy tokens
@@ -287,7 +287,10 @@ The following table shows the prefixes for each type of token.
## Expired access tokens
If an existing access token is in use and reaches the `expires_at` value, the token
-expires and can no longer be used for authentication.
+expires and:
+
+- Can no longer be used for authentication.
+- Is not visible in the UI.
Requests made using this token return a `401 Unauthorized` response. Too many
unauthorized requests in a short period of time from the same IP address
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 264045ac93c..2450eca86d7 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5888,6 +5888,9 @@ msgstr ""
msgid "Analytics|Exclude anonymous users"
msgstr ""
+msgid "Analytics|Failed to clear project-level settings. Please try again or %{linkStart}clear them manually%{linkEnd}."
+msgstr ""
+
msgid "Analytics|Failed to fetch data"
msgstr ""
@@ -23391,9 +23394,6 @@ msgstr ""
msgid "GitLab Pages"
msgstr ""
-msgid "GitLab Pages has moved"
-msgstr ""
-
msgid "GitLab Premium"
msgstr ""
@@ -39515,7 +39515,7 @@ msgstr ""
msgid "ProductAnalytics|This might take a while, feel free to navigate away from this page and come back later."
msgstr ""
-msgid "ProductAnalytics|This project uses the provider configuration. To connect to a GitLab-managed provider, you'll be redirected to the %{analyticsSettingsLink} page where you must remove the current configuration."
+msgid "ProductAnalytics|This project has analytics provider settings configured. If you continue, these project-level settings will be reset so that GitLab-managed provider settings can be used."
msgstr ""
msgid "ProductAnalytics|This table excludes projects that do not have product analytics onboarded."
@@ -54144,9 +54144,6 @@ msgstr ""
msgid "To get started, use the link below to confirm your account."
msgstr ""
-msgid "To go to GitLab Pages, on the left sidebar, select %{pages_link}."
-msgstr ""
-
msgid "To invite more users, you can reduce the number of users in your top-level group to %{free_limit} user or less. You can also upgrade to a paid tier which do not have user limits. If you need additional time, you can start a free 30-day trial which includes unlimited users."
msgid_plural "To invite more users, you can reduce the number of users in your top-level group to %{free_limit} users or less. You can also upgrade to a paid tier which do not have user limits. If you need additional time, you can start a free 30-day trial which includes unlimited users."
msgstr[0] ""
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_from_push_notification_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_from_push_notification_spec.rb
index 4b08409367e..120e52ac180 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_from_push_notification_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_from_push_notification_spec.rb
@@ -14,6 +14,10 @@ module QA
it(
'after a push via the git CLI creates a merge request',
+ quarantine: {
+ issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/442691',
+ type: :flaky
+ },
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/360489'
) do
Resource::Repository::ProjectPush.fabricate! do |push|
diff --git a/spec/views/projects/edit.html.haml_spec.rb b/spec/views/projects/edit.html.haml_spec.rb
index 127dbf18a0a..b9a1b2716a5 100644
--- a/spec/views/projects/edit.html.haml_spec.rb
+++ b/spec/views/projects/edit.html.haml_spec.rb
@@ -104,14 +104,6 @@ RSpec.describe 'projects/edit' do
end
end
- describe 'pages menu entry callout' do
- it 'does show a callout' do
- render
-
- expect(rendered).to have_content(_('GitLab Pages has moved'))
- end
- end
-
describe 'notifications on renaming the project path' do
context 'when the GitlabAPI is supported' do
before do