root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2023-03-27 21:09:43 +00:00
parent c478950af9
commit ff2a881e20
8 changed files with 83 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/analytics/shared/components/value_streams_dashboard_link.vue
View File

@ -13,6 +13,7 @@ export default {
},
i18n: {
title: __('Related'),
// eslint-disable-next-line @gitlab/require-valid-i18n-helpers
linkText: __('Value Streams Dashboard | DORA'),
},
};

4
app/assets/javascripts/merge_request_tabs.js
View File

@ -13,7 +13,7 @@ import axios from './lib/utils/axios_utils';
import { localTimeAgo } from './lib/utils/datetime_utility';
import { isInVueNoteablePage } from './lib/utils/dom_utils';
import { __ } from './locale';
import { __, s__ } from './locale';
import syntaxHighlight from './syntax_highlight';
// MergeRequestTabs
@ -316,7 +316,7 @@ export default class MergeRequestTabs {
})
.catch(() => {
toggleLoader(false);
createAlert({ message: __('MergeRequest|Failed to load the page') });
createAlert({ message: s__('MergeRequest|Failed to load the page') });
});
}

57
doc/user/project/repository/vscode.md
View File

@ -35,6 +35,63 @@ you can [configure](https://marketplace.visualstudio.com/items?itemName=GitLab.g
- [Features to display or hide](https://gitlab.com/gitlab-org/gitlab-vscode-extension#extension-settings).
- [Self-signed certificate](https://marketplace.visualstudio.com/items?itemName=GitLab.gitlab-workflow#self-signed-certificates) information.
## Code Suggestions (Closed Beta) **(ULTIMATE)**
> [Introduced](https://about.gitlab.com/releases/2023/02/22/gitlab-15-9-released/#code-suggestions-available-in-closed-beta) in GitLab 15.9 as [Closed Beta](/ee/policy/alpha-beta-support.md#closed-beta-features).
FLAG:
This feature is in Closed Beta. To request to join the Closed Beta, [fill out this form](https://forms.gle/cbjqJhLGV1i7t6Sd8).
Code Suggestions empower your developers to code more efficiently by suggesting code
as they type. Depending on the cursor position, the extension either:
- Provides entire code snippets, like generating functions.
- Completes the current line.
Developers can press <kbd>Tab</tab> to accept suggestions.
Code Suggestions support the following languages with the highest confidence:
- C
- C++
- Java
- JavaScript
- Go
- Python
Suggestions may be mixed for other languages.
<div class="video-fallback">
See an end-to-end demo: <a href="https://www.youtube.com/watch?v=WnxBYxN2-p4">How to get started with GitLab Code Suggestions in VS Code</a>.
</div>
<figure class="video-container">
<iframe src="https://www.youtube-nocookie.com/embed/WnxBYxN2-p4" frameborder="0" allowfullscreen> </iframe>
</figure>
### Enable Code Suggestions **(ULTIMATE)**
Prerequisites:
- You have been granted access to the Closed Beta.
- You have [created a personal access token](../../profile/personal_access_tokens.md#create-a-personal-access-token)
with the `read_api` and `read_user` scopes.
To enable Code Suggestions in VS Code:
1. Download and configure the
[GitLab Workflow extension](https://marketplace.visualstudio.com/items?itemName=GitLab.gitlab-workflow)
for Visual Studio Code.
1. In **GitLab: Add Account to VS Code on Mac**, add your GitLab work account to the VS Code extension:
- In macOS, press <kbd>Shift</kbd> + <kbd>Command</kbd> + <kbd>P</kbd>.
- In Windows, press <kbd>Shift</kbd> + <kbd>Control</kbd> + <kbd>P</kbd>
1. Provide your GitLab instance URL. A default is provided.
1. Provide your personal access token.
1. After your GitLab account connects successfully, in the left sidebar, select **Extensions**.
1. Find the **GitLab workflow** extension, and select **Settings** (**{settings}**).
1. Enable **GitLab › AI Assisted Code Suggestions**.
Start typing and receive suggestions for your GitLab projects.
## Report issues with the extension
Report any issues, bugs, or feature requests in the

4
locale/gitlab.pot
View File

@ -18576,12 +18576,12 @@ msgid "Geo sites"
msgstr ""
msgid "Geo|%d group selected"
msgid_plural "%d groups selected"
msgid_plural "Geo|%d groups selected"
msgstr[0] ""
msgstr[1] ""
msgid "Geo|%d shard selected"
msgid_plural "%d shards selected"
msgid_plural "Geo|%d shards selected"
msgstr[0] ""
msgstr[1] ""

2
package.json
View File

@ -210,7 +210,7 @@
"yaml": "^2.0.0-10"
},
"devDependencies": {
"@gitlab/eslint-plugin": "18.2.1",
"@gitlab/eslint-plugin": "18.3.0",
"@gitlab/stylelint-config": "4.1.0",
"@graphql-eslint/eslint-plugin": "3.16.1",
"@testing-library/dom": "^7.16.2",

20
spec/features/groups/group_settings_spec.rb
View File

@ -148,13 +148,15 @@ RSpec.describe 'Edit group settings', feature_category: :subgroups do
end
it 'can successfully transfer the group' do
selected_group_path = selected_group.path
visit edit_group_path(selected_group)
page.within('[data-testid="transfer-locations-dropdown"]') do
click_button _('Select parent group')
fill_in _('Search'), with: target_group_name
fill_in _('Search'), with: target_group&.name || ''
wait_for_requests
click_button(target_group_name || 'No parent group')
click_button(target_group&.name || 'No parent group')
end
click_button s_('GroupSettings|Transfer group')
@ -167,10 +169,15 @@ RSpec.describe 'Edit group settings', feature_category: :subgroups do
end
within('[data-testid="breadcrumb-links"]') do
expect(page).to have_content(target_group_name) if target_group_name
expect(page).to have_content(target_group.name) if target_group
expect(page).to have_content(selected_group.name)
end
expect(current_url).to include(selected_group.reload.full_path)
if target_group
expect(current_url).to include("#{target_group.path}/#{selected_group_path}")
else
expect(current_url).to include(selected_group_path)
end
end
end
@ -178,14 +185,13 @@ RSpec.describe 'Edit group settings', feature_category: :subgroups do
let(:selected_group) { create(:group, path: 'foo-subgroup', parent: group) }
context 'when transfering to no parent group' do
let(:target_group_name) { nil }
let(:target_group) { nil }
it_behaves_like 'can transfer the group'
end
context 'when transfering to a parent group' do
let(:target_group) { create(:group, path: 'foo-parentgroup') }
let(:target_group_name) { target_group.name }
before do
target_group.add_owner(user)
@ -197,7 +203,7 @@ RSpec.describe 'Edit group settings', feature_category: :subgroups do
context 'when transfering from a root group to a parent group' do
let(:selected_group) { create(:group, path: 'foo-rootgroup') }
let(:target_group_name) { group.name }
let(:target_group) { group }
it_behaves_like 'can transfer the group'
end

5
spec/features/users/login_spec.rb
View File

@ -321,7 +321,8 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
end
context 'using one-time code' do
it 'allows login with valid code' do
it 'allows login with valid code',
quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/402322' do
expect(authentication_metrics)
.to increment(:user_authenticated_counter)
.and increment(:user_two_factor_authenticated_counter)
@ -361,7 +362,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
expect(page).to have_current_path root_path, ignore_query: true
end
it 'triggers ActiveSession.cleanup for the user' do
it 'triggers ActiveSession.cleanup for the user', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/402322' do
expect(authentication_metrics)
.to increment(:user_authenticated_counter)
.and increment(:user_two_factor_authenticated_counter)

8
yarn.lock
View File

@ -1085,10 +1085,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e"
integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg==
"@gitlab/eslint-plugin@18.2.1":
version "18.2.1"
resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-18.2.1.tgz#aa7dccb9812bf2b3424cdd841fc4dfc1c9800c73"
integrity sha512-AJKXFuu+87jrkoD4iguFn5/Zxq+u6JqRgE6G1R4A04KRMLXiwP/pweD5Gy4yCW1c6TbBI6NRJ1Q1GOvmYNkTiQ==
"@gitlab/eslint-plugin@18.3.0":
version "18.3.0"
resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-18.3.0.tgz#1bb7bdfc39ccd4a6b2826608cede2d348cc76c48"
integrity sha512-cPWPDty+7KPyBeYaJZ/EJ9oAWQVj4onea7mHPdZnGtqtL3NcPU8VT0kIXPCk2bcYG2KhA58J+t6nF7NJ/MVPfg==
dependencies:
"@babel/core" "^7.17.0"
"@babel/eslint-parser" "^7.17.0"