Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/integration/jira/development_panel.md2
-rw-r--r--doc/security/token_overview.md33
-rw-r--r--doc/user/project/integrations/aws_codepipeline.md4
-rw-r--r--spec/features/dashboard/shortcuts_spec.rb1
-rw-r--r--spec/features/explore/user_explores_projects_spec.rb35
-rw-r--r--spec/features/users/rss_spec.rb13
-rw-r--r--spec/features/users/show_spec.rb30
-rw-r--r--spec/support/shared_examples/features/explore/sidebar_shared_examples.rb28
8 files changed, 91 insertions, 55 deletions
diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md
index 02838239156..70e3534a32b 100644
--- a/doc/integration/jira/development_panel.md
+++ b/doc/integration/jira/development_panel.md
@@ -49,6 +49,8 @@ You can [view GitLab activity for a Jira issue](https://support.atlassian.com/ji
in the Jira development panel by referring to the Jira issue by ID in GitLab. The information displayed in the development panel
depends on where you mention the Jira issue ID in GitLab.
+For the [GitLab for Jira Cloud app](connect-app.md), the following information is displayed.
+
| GitLab: where you mention the Jira issue ID | Jira development panel: what information is displayed |
|------------------------------------------------|-------------------------------------------------------|
| Merge request title or description | Link to the merge request<br>Link to the deployment<br>Link to the pipeline through merge request title<br>Link to the pipeline through merge request description <sup>1</sup><br>Link to the branch <sup>2</sup><br>Reviewer information and approval status <sup>3</sup> |
diff --git a/doc/security/token_overview.md b/doc/security/token_overview.md
index c56fe0b9260..82e16694470 100644
--- a/doc/security/token_overview.md
+++ b/doc/security/token_overview.md
@@ -222,6 +222,39 @@ This table shows available scopes per token. Scopes can be limited further on to
1. Runner registration and authentication token don't provide direct access to repositories, but can be used to register and authenticate a new runner that may execute jobs which do have access to the repository
1. Limited to certain [endpoints](../ci/jobs/ci_job_token.md).
+## Token prefixes
+
+The following tables show the prefixes for each type of token where applicable.
+
+### GitLab tokens
+
+| Token name | Prefix |
+|-----------------------------------|--------------------|
+| Personal access token | `glpat-` |
+| OAuth Application Secret | `gloas-` |
+| Impersonation token | Not applicable. |
+| Project access token | Not applicable. |
+| Group access token | Not applicable. |
+| Deploy token | Not applicable. |
+| Deploy key | Not applicable. |
+| Runner registration token | Not applicable. |
+| Runner authentication token | `glrt-` |
+| Job token | Not applicable. |
+| Trigger token | `glptt-` |
+| Legacy runner registration token | GR1348941 |
+| Feed token | `glft-` |
+| Incoming mail token | `glimt-` |
+| GitLab Agent for Kubernetes token | `glagent-` |
+| GitLab session cookies | `_gitlab_session=` |
+
+### External system tokens
+
+| Token name | Prefix |
+|-----------------|-----------------|
+| Omamori tokens | `omamori_pat_` |
+| AWS credentials | `AKIA` |
+| GCP credentials | Not applicable. |
+
## Security considerations
1. Treat access tokens like passwords and keep them secure.
diff --git a/doc/user/project/integrations/aws_codepipeline.md b/doc/user/project/integrations/aws_codepipeline.md
index b081544199e..5404101b4f6 100644
--- a/doc/user/project/integrations/aws_codepipeline.md
+++ b/doc/user/project/integrations/aws_codepipeline.md
@@ -1,6 +1,6 @@
---
-stage: Manage
-group: Import and Integrate
+stage: none
+group: unassigned
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
---
diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb
index c8013d364e3..976dcc5a027 100644
--- a/spec/features/dashboard/shortcuts_spec.rb
+++ b/spec/features/dashboard/shortcuts_spec.rb
@@ -50,7 +50,6 @@ RSpec.describe 'Dashboard shortcuts', :js, feature_category: :shared do
context 'logged out' do
before do
- stub_feature_flags(super_sidebar_logged_out: false)
visit explore_root_path
end
diff --git a/spec/features/explore/user_explores_projects_spec.rb b/spec/features/explore/user_explores_projects_spec.rb
index 43d464e0c9f..e1341824bfd 100644
--- a/spec/features/explore/user_explores_projects_spec.rb
+++ b/spec/features/explore/user_explores_projects_spec.rb
@@ -3,20 +3,45 @@
require 'spec_helper'
RSpec.describe 'User explores projects', feature_category: :user_profile do
- before do
- stub_feature_flags(super_sidebar_logged_out: false)
+ shared_examples 'an "Explore > Projects" page with sidebar and breadcrumbs' do |page_path|
+ before do
+ visit send(page_path)
+ end
+
+ describe "sidebar", :js do
+ it 'shows the "Explore" sidebar' do
+ has_testid?('super-sidebar')
+ within_testid('super-sidebar') do
+ expect(page).to have_css('#super-sidebar-context-header', text: 'Explore')
+ end
+ end
+
+ it 'shows the "Projects" menu item as active' do
+ within_testid('super-sidebar') do
+ expect(page).to have_css("[aria-current='page']", text: "Projects")
+ end
+ end
+ end
+
+ describe 'breadcrumbs' do
+ it 'has "Explore" as its root breadcrumb' do
+ within '.breadcrumbs-list li:first' do
+ expect(page).to have_link('Explore', href: explore_root_path)
+ end
+ end
+ end
end
describe '"All" tab' do
- it_behaves_like 'an "Explore" page with sidebar and breadcrumbs', :explore_projects_path, :projects
+ it_behaves_like 'an "Explore > Projects" page with sidebar and breadcrumbs', :explore_projects_path
end
describe '"Most starred" tab' do
- it_behaves_like 'an "Explore" page with sidebar and breadcrumbs', :starred_explore_projects_path, :projects
+ it_behaves_like 'an "Explore > Projects" page with sidebar and breadcrumbs', :starred_explore_projects_path
end
describe '"Trending" tab' do
- it_behaves_like 'an "Explore" page with sidebar and breadcrumbs', :trending_explore_projects_path, :projects
+ it_behaves_like 'an "Explore > Projects" page with sidebar and breadcrumbs', :trending_explore_projects_path
end
context 'when some projects exist' do
diff --git a/spec/features/users/rss_spec.rb b/spec/features/users/rss_spec.rb
index 6cc081d2b65..730c31df899 100644
--- a/spec/features/users/rss_spec.rb
+++ b/spec/features/users/rss_spec.rb
@@ -3,8 +3,8 @@
require 'spec_helper'
RSpec.describe 'User RSS', feature_category: :user_profile do
- let(:user) { create(:user, :no_super_sidebar) }
- let(:path) { user_path(create(:user, :no_super_sidebar)) }
+ let(:user) { create(:user) }
+ let(:path) { user_path(create(:user)) }
context 'when signed in' do
before do
@@ -13,7 +13,9 @@ RSpec.describe 'User RSS', feature_category: :user_profile do
end
it 'shows the RSS link with overflow menu', :js do
- find('[data-testid="base-dropdown-toggle"').click
+ page.within('.user-cover-block') do
+ find_by_testid('base-dropdown-toggle').click
+ end
expect(page).to have_link 'Subscribe', href: /feed_token=glft-.*-#{user.id}/
end
@@ -21,12 +23,13 @@ RSpec.describe 'User RSS', feature_category: :user_profile do
context 'when signed out' do
before do
- stub_feature_flags(super_sidebar_logged_out: false)
visit path
end
it 'has an RSS without a feed token', :js do
- find('[data-testid="base-dropdown-toggle"').click
+ page.within('.user-cover-block') do
+ find_by_testid('base-dropdown-toggle').click
+ end
expect(page).not_to have_link 'Subscribe', href: /feed_token=glft-.*-#{user.id}/
end
diff --git a/spec/features/users/show_spec.rb b/spec/features/users/show_spec.rb
index a638dad7edc..2821e8286a4 100644
--- a/spec/features/users/show_spec.rb
+++ b/spec/features/users/show_spec.rb
@@ -7,16 +7,14 @@ RSpec.describe 'User page', feature_category: :user_profile do
let_it_be(:user) { create(:user, bio: '<b>Lorem</b> <i>ipsum</i> dolor sit <a href="https://example.com">amet</a>') }
- before do
- stub_feature_flags(super_sidebar_logged_out: false)
- end
-
subject(:visit_profile) { visit(user_path(user)) }
it 'shows copy user id action in the dropdown', :js do
subject
- find('[data-testid="base-dropdown-toggle"').click
+ page.within('.user-cover-block') do
+ find_by_testid('base-dropdown-toggle').click
+ end
expect(page).to have_content("Copy user ID: #{user.id}")
end
@@ -173,33 +171,37 @@ RSpec.describe 'User page', feature_category: :user_profile do
expect(page).not_to have_button(text: 'Follow', class: 'gl-button')
end
- shared_examples 'follower tabs with count badges' do
- it 'shows 0 followers and 0 following' do
+ shared_examples 'follower links with count badges' do
+ it 'shows no count if no followers / following' do
subject
- expect(page).to have_content('Followers 0')
- expect(page).to have_content('Following 0')
+ within_testid('super-sidebar') do
+ expect(page).to have_link(text: 'Followers')
+ expect(page).to have_link(text: 'Following')
+ end
end
- it 'shows 1 followers and 1 following' do
+ it 'shows count if followers / following' do
follower.follow(user)
user.follow(followee)
subject
- expect(page).to have_content('Followers 1')
- expect(page).to have_content('Following 1')
+ within_testid('super-sidebar') do
+ expect(page).to have_link(text: 'Followers 1')
+ expect(page).to have_link(text: 'Following 1')
+ end
end
end
- it_behaves_like 'follower tabs with count badges'
+ it_behaves_like 'follower links with count badges'
context 'with profile_tabs_vue feature flag disabled' do
before_all do
stub_feature_flags(profile_tabs_vue: false)
end
- it_behaves_like 'follower tabs with count badges'
+ it_behaves_like 'follower links with count badges'
end
it 'does show button to follow' do
diff --git a/spec/support/shared_examples/features/explore/sidebar_shared_examples.rb b/spec/support/shared_examples/features/explore/sidebar_shared_examples.rb
deleted file mode 100644
index 1754c8bf53d..00000000000
--- a/spec/support/shared_examples/features/explore/sidebar_shared_examples.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.shared_examples 'an "Explore" page with sidebar and breadcrumbs' do |page_path, menu_label|
- before do
- visit send(page_path)
- end
-
- let(:sidebar_css) { 'aside.nav-sidebar[aria-label="Explore"]' }
- let(:active_menu_item_css) { "li.active[data-track-label=\"#{menu_label}_menu\"]" }
-
- it 'shows the "Explore" sidebar' do
- expect(page).to have_css(sidebar_css)
- end
-
- it 'shows the correct sidebar menu item as active' do
- within(sidebar_css) do
- expect(page).to have_css(active_menu_item_css)
- end
- end
-
- describe 'breadcrumbs' do
- it 'has "Explore" as its root breadcrumb' do
- within '.breadcrumbs-list' do
- expect(page).to have_css("li:first a[href=\"#{explore_root_path}\"]", text: 'Explore')
- end
- end
- end
-end
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 10:39:57 +0300