From 2fff82c54ce215aceabe5b5236fafeea005d4eee Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 17 Mar 2022 06:08:26 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../components/related_issues_block.vue | 12 +++++++++++ .../components/related_issues_root.vue | 12 +++++++++++ app/assets/javascripts/related_issues/index.js | 1 + app/views/search/results/_blob_highlight.html.haml | 8 ++++++- data/deprecations/14-9-pages-daemon.yml | 16 ++++++++++++++ doc/administration/instance_limits.md | 2 +- doc/api/users.md | 2 +- doc/install/openshift_and_gitlab/index.md | 6 ++++++ doc/update/deprecations.md | 6 ++++++ .../components/related_issues_block_spec.js | 6 ++++++ spec/views/search/_results.html.haml_spec.rb | 25 ++++++++++++++++++++++ 11 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 data/deprecations/14-9-pages-daemon.yml diff --git a/app/assets/javascripts/related_issues/components/related_issues_block.vue b/app/assets/javascripts/related_issues/components/related_issues_block.vue index d9184973304..eeb4c254a1b 100644 --- a/app/assets/javascripts/related_issues/components/related_issues_block.vue +++ b/app/assets/javascripts/related_issues/components/related_issues_block.vue @@ -85,6 +85,16 @@ export default { required: false, default: true, }, + autoCompleteEpics: { + type: Boolean, + required: false, + default: true, + }, + autoCompleteIssues: { + type: Boolean, + required: false, + default: true, + }, }, computed: { hasRelatedIssues() { @@ -198,6 +208,8 @@ export default { :input-value="inputValue" :pending-references="pendingReferences" :auto-complete-sources="autoCompleteSources" + :auto-complete-epics="autoCompleteEpics" + :auto-complete-issues="autoCompleteIssues" :path-id-separator="pathIdSeparator" @pendingIssuableRemoveRequest="$emit('pendingIssuableRemoveRequest', $event)" @addIssuableFormInput="$emit('addIssuableFormInput', $event)" diff --git a/app/assets/javascripts/related_issues/components/related_issues_root.vue b/app/assets/javascripts/related_issues/components/related_issues_root.vue index 7e2fda8495c..40d58c04753 100644 --- a/app/assets/javascripts/related_issues/components/related_issues_root.vue +++ b/app/assets/javascripts/related_issues/components/related_issues_root.vue @@ -71,6 +71,16 @@ export default { required: false, default: true, }, + autoCompleteEpics: { + type: Boolean, + required: false, + default: true, + }, + autoCompleteIssues: { + type: Boolean, + required: false, + default: true, + }, pathIdSeparator: { type: String, required: false, @@ -241,6 +251,8 @@ export default { :is-form-visible="isFormVisible" :input-value="inputValue" :auto-complete-sources="autoCompleteSources" + :auto-complete-epics="autoCompleteEpics" + :auto-complete-issues="autoCompleteIssues" :issuable-type="issuableType" :path-id-separator="pathIdSeparator" :show-categorized-issues="showCategorizedIssues" diff --git a/app/assets/javascripts/related_issues/index.js b/app/assets/javascripts/related_issues/index.js index 35858be90b2..b61f1cf2470 100644 --- a/app/assets/javascripts/related_issues/index.js +++ b/app/assets/javascripts/related_issues/index.js @@ -21,6 +21,7 @@ export default function initRelatedIssues() { showCategorizedIssues: parseBoolean( relatedIssuesRootElement.dataset.showCategorizedIssues, ), + autoCompleteEpics: false, }, }), }); diff --git a/app/views/search/results/_blob_highlight.html.haml b/app/views/search/results/_blob_highlight.html.haml index de1fa9a7fd5..729eda331b5 100644 --- a/app/views/search/results/_blob_highlight.html.haml +++ b/app/views/search/results/_blob_highlight.html.haml @@ -10,7 +10,13 @@ .line-numbers .gl-display-flex %span.diff-line-num.gl-pl-3 - %a.has-tooltip{ href: "#{blame_link}#L#{i}", id: "blame-L#{i}", 'data-line-number' => i, title: _('View blame') } + %a.has-tooltip{ href: "#{blame_link}#L#{i}", + id: "blame-L#{i}", + data: { "line_number" => i, + "track_action" => 'click_link', + "track_label" => 'git_blame', + "track_property" => 'search_result' }, + title: _('View blame') } = sprite_icon('git') %span.diff-line-num.flex-grow-1.gl-pr-3 %a{ href: "#{blob_link}#L#{i}", id: "blob-L#{i}", 'data-line-number' => i, class: 'gl-display-flex! gl-align-items-center gl-justify-content-end' } diff --git a/data/deprecations/14-9-pages-daemon.yml b/data/deprecations/14-9-pages-daemon.yml new file mode 100644 index 00000000000..a8fb5924ac6 --- /dev/null +++ b/data/deprecations/14-9-pages-daemon.yml @@ -0,0 +1,16 @@ +- name: "GitLab Pages running as daemon" # The name of the feature to be deprecated + announcement_milestone: "14.9" # The milestone when this feature was first announced as deprecated. + announcement_date: "2022-03-22" # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post. + removal_milestone: "15.0" # The milestone when this feature is planned to be removed + removal_date: "2022-05-22" # The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post. + breaking_change: false # If this deprecation is a breaking change, set this value to true + reporter: cbalane # GitLab username of the person reporting the deprecation + body: | # Do not modify this line, instead modify the lines below. + In 15.0, support for daemon mode for GitLab Pages will be removed. + # The following items are not published on the docs page, but may be used in the future. + stage: # (optional - may be required in the future) String value of the stage that the feature was created in. e.g., Growth + tiers: # (optional - may be required in the future) An array of tiers that the feature is available in currently. e.g., [Free, Silver, Gold, Core, Premium, Ultimate] + issue_url: # (optional) This is a link to the deprecation issue in GitLab + documentation_url: # (optional) This is a link to the current documentation page + image_url: # (optional) This is a link to a thumbnail image depicting the feature + video_url: # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md index 78715e42753..a14c16a5f7a 100644 --- a/doc/administration/instance_limits.md +++ b/doc/administration/instance_limits.md @@ -563,7 +563,7 @@ Plan.default.actual_limits.update!(ci_max_artifact_size_junit: 10) ### Number of files per GitLab Pages web-site -The total number of file entries (including directories and symlinks) is limited to `100000` per +The total number of file entries (including directories and symlinks) is limited to `200,000` per GitLab Pages website. This is the default limit for all [GitLab self-managed and SaaS plans](https://about.gitlab.com/pricing/). diff --git a/doc/api/users.md b/doc/api/users.md index 1ab42a0c28b..de9af59de93 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -603,7 +603,7 @@ Parameters: "avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg", "web_url": "http://localhost:3000/john_smith", "created_at": "2012-05-23T08:00:58Z", - "is_admin": false, + "is_admin": true, "bio": "", "location": null, "public_email": "john@example.com", diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md index 99a7cd12767..364c27f089f 100644 --- a/doc/install/openshift_and_gitlab/index.md +++ b/doc/install/openshift_and_gitlab/index.md @@ -29,6 +29,12 @@ The GitLab Operator does not include the GitLab Runner. To install and manage a ## Unsupported GitLab features +### Secure and Protect + +- License Compliance +- Code Quality scanning +- Cluster Image Scanning + ### Docker-in-Docker When using OpenShift to run a GitLab Runner Fleet, we do not support some GitLab features given OpenShift's security model. diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md index c2409af70e6..e89c45c522c 100644 --- a/doc/update/deprecations.md +++ b/doc/update/deprecations.md @@ -38,6 +38,12 @@ For deprecation reviewers (Technical Writers only): ## 14.9 +### GitLab Pages running as daemon + +In 15.0, support for daemon mode for GitLab Pages will be removed. + +**Planned removal milestone: 15.0 (2022-05-22)** + ### GitLab self-monitoring WARNING: diff --git a/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js b/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js index c7925034eb0..7a350df0ba6 100644 --- a/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js +++ b/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js @@ -6,6 +6,7 @@ import { issuable3, } from 'jest/issuable/components/related_issuable_mock_data'; import RelatedIssuesBlock from '~/related_issues/components/related_issues_block.vue'; +import AddIssuableForm from '~/related_issues/components/add_issuable_form.vue'; import { issuableTypesMap, linkedIssueTypesMap, @@ -139,6 +140,7 @@ describe('RelatedIssuesBlock', () => { pathIdSeparator: PathIdSeparator.Issue, isFormVisible: true, issuableType: 'issue', + autoCompleteEpics: false, }, }); }); @@ -146,6 +148,10 @@ describe('RelatedIssuesBlock', () => { it('shows add related issues form', () => { expect(wrapper.find('.js-add-related-issues-form-area').exists()).toBe(true); }); + + it('sets `autoCompleteEpics` to false for add-issuable-form', () => { + expect(wrapper.find(AddIssuableForm).props('autoCompleteEpics')).toBe(false); + }); }); describe('showCategorizedIssues prop', () => { diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb index 515ec62fe3c..72e2d7131c0 100644 --- a/spec/views/search/_results.html.haml_spec.rb +++ b/spec/views/search/_results.html.haml_spec.rb @@ -96,6 +96,31 @@ RSpec.describe 'search/_results' do end end + describe 'git blame click tracking' do + let(:scope) { 'blobs' } + let(:search_objects) { Gitlab::ProjectSearchResults.new(user, 'testing', project: project).objects(scope) } + + context 'when admin mode is enabled', :enable_admin_mode do + it 'renders the click link event tracking attributes' do + render + + expect(rendered).to have_selector('[data-track-action=click_link]') + expect(rendered).to have_selector('[data-track-label=git_blame]') + expect(rendered).to have_selector('[data-track-property=search_result]') + end + end + + context 'when admin mode is disabled' do + it 'does not render the click link event tracking attributes' do + render + + expect(rendered).not_to have_selector('[data-track-action=click_link]') + expect(rendered).not_to have_selector('[data-track-label=git_blame]') + expect(rendered).not_to have_selector('[data-track-property=search_result]') + end + end + end + %w[blobs notes wiki_blobs milestones].each do |search_scope| context "when scope is #{search_scope}" do let(:scope) { search_scope } -- cgit v1.2.3