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--app/assets/javascripts/emoji/components/picker.vue14
-rw-r--r--app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue2
-rw-r--r--doc/api/graphql/getting_started.md5
-rw-r--r--doc/api/graphql/index.md3
-rw-r--r--doc/api/index.md5
-rw-r--r--doc/integration/bitbucket.md4
-rw-r--r--doc/integration/omniauth.md6
-rw-r--r--doc/integration/openid_connect_provider.md29
-rw-r--r--doc/user/project/integrations/discord_notifications.md2
-rw-r--r--doc/user/project/integrations/github.md5
-rw-r--r--doc/user/project/integrations/gitlab_slack_application.md3
-rw-r--r--doc/user/project/integrations/hangouts_chat.md2
-rw-r--r--doc/user/project/integrations/webhooks.md4
-rw-r--r--locale/gitlab.pot15
-rw-r--r--spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js11
15 files changed, 59 insertions, 51 deletions
diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue
index dc3eac0cd0c..b3888114396 100644
--- a/app/assets/javascripts/emoji/components/picker.vue
+++ b/app/assets/javascripts/emoji/components/picker.vue
@@ -28,6 +28,16 @@ export default {
required: false,
default: () => [],
},
+ right: {
+ type: Boolean,
+ required: false,
+ default: true,
+ },
+ boundary: {
+ type: String,
+ required: false,
+ default: '',
+ },
},
data() {
return {
@@ -62,7 +72,7 @@ export default {
addToFrequentlyUsed(name);
},
getBoundaryElement() {
- return document.querySelector('.content-wrapper') || 'scrollParent';
+ return this.boundary || document.querySelector('.content-wrapper') || 'scrollParent';
},
onSearchInput() {
this.$refs.virtualScoller.setScrollTop(0);
@@ -87,7 +97,7 @@ export default {
menu-class="dropdown-extended-height"
category="secondary"
no-flip
- right
+ :right="right"
lazy
@shown="$emit('shown')"
@hidden="$emit('hidden')"
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
index e41f3aa5c9d..a746642c191 100644
--- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
+++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
@@ -267,6 +267,8 @@ export default {
v-if="glFeatures.improvedEmojiPicker"
dropdown-class="gl-h-full"
toggle-class="btn emoji-menu-toggle-button gl-px-4! gl-rounded-top-right-none! gl-rounded-bottom-right-none!"
+ boundary="viewport"
+ :right="false"
@click="setEmoji"
>
<template #button-content>
diff --git a/doc/api/graphql/getting_started.md b/doc/api/graphql/getting_started.md
index e3cf81148c2..258f781528b 100644
--- a/doc/api/graphql/getting_started.md
+++ b/doc/api/graphql/getting_started.md
@@ -44,8 +44,7 @@ you to explore the schema and types.
The examples below:
-- Can be run directly against GitLab 11.0 or later, though some of the types
- and fields may not be supported in older versions.
+- Can be run directly against GitLab.
- Works against GitLab.com without any further setup. Make sure you are signed
in and navigate to the [GraphiQL Explorer](https://gitlab.com/-/graphql-explorer).
@@ -60,7 +59,7 @@ either:
Refer to [running GraphiQL](index.md#graphiql) for more information.
NOTE:
-If you are running GitLab 11.0 to 12.0, enable the `graphql`
+If you are running GitLab 12.0, enable the `graphql`
[feature flag](../features.md#set-or-create-a-feature).
## Queries and mutations
diff --git a/doc/api/graphql/index.md b/doc/api/graphql/index.md
index bcaa5930faf..14512286ade 100644
--- a/doc/api/graphql/index.md
+++ b/doc/api/graphql/index.md
@@ -6,8 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# GraphQL API **(FREE)**
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/19008) in GitLab 11.0 [with a flag](../../administration/feature_flags.md) named `graphql`.
-> - [Enabled](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30444) in GitLab 12.1.
+> [Generally available](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30444) in GitLab 12.1. [Feature flag `graphql`](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30444) removed.
[GraphQL](https://graphql.org/) is a query language for APIs. You can use it to
request the exact data you need, and therefore limit the number of requests you need.
diff --git a/doc/api/index.md b/doc/api/index.md
index a4e7a893618..75081897a65 100644
--- a/doc/api/index.md
+++ b/doc/api/index.md
@@ -64,8 +64,7 @@ For the changes between v3 and v4, see the [v3 to v4 documentation](v3_to_v4.md)
### Current status
-Only API version v4 is available. Version v3 was removed in
-[GitLab 11.0](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/36819).
+Only API version v4 is available.
## How to use the API
@@ -224,8 +223,6 @@ header.
#### Disable impersonation
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/40385) in GitLab 11.6.
-
By default, impersonation is enabled. To disable impersonation:
**For Omnibus installations**
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md
index db7e7d74efe..2fc80aa1769 100644
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
@@ -6,10 +6,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Integrate your GitLab server with Bitbucket Cloud **(FREE SELF)**
-NOTE:
-Starting from GitLab 11.4, OmniAuth is enabled by default. If you're using an
-earlier version, you must explicitly enable it.
-
You can set up Bitbucket.org as an OAuth 2.0 provider to use your Bitbucket.org
account credentials to sign in to GitLab. You can also import your projects from
Bitbucket.org.
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index ef2b3f7e7d6..4c05f94148c 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -46,10 +46,6 @@ GitLab supports the following OmniAuth providers.
## Configure initial settings
-NOTE:
-In GitLab 11.4 and later, OmniAuth is enabled by default. If you're using an
-earlier version, you must explicitly enable it.
-
Before you configure the OmniAuth provider,
configure the settings that are common for all providers.
@@ -153,7 +149,7 @@ To enable or disable an OmniAuth provider:
## Disable OmniAuth
-In GitLab 11.4 and later, OmniAuth is enabled by default. However, OmniAuth only works
+OmniAuth is enabled by default. However, OmniAuth only works
if providers are configured and [enabled](#enable-or-disable-sign-in-with-an-omniauth-provider-without-disabling-import-sources).
If OmniAuth providers are causing problems even when individually disabled, you
diff --git a/doc/integration/openid_connect_provider.md b/doc/integration/openid_connect_provider.md
index 54d4a5b6bb7..e85231d1c25 100644
--- a/doc/integration/openid_connect_provider.md
+++ b/doc/integration/openid_connect_provider.md
@@ -47,20 +47,19 @@ The following user information is shared with clients:
| Claim | Type | Description |
|:-----------------|:----------|:------------|
-| `sub` | `string` | The ID of the user
-| `sub_legacy` | `string` | An opaque token that uniquely identifies the user<br><br>**Deprecation notice:** this token isn't stable because it's tied to the Rails secret key base, and is provided only for migration to the new stable `sub` value available from GitLab 11.1
-| `auth_time` | `integer` | The timestamp for the user's last authentication
-| `name` | `string` | The user's full name
-| `nickname` | `string` | The user's GitLab username
-| `email` | `string` | The user's email address<br>This is the user's *primary* email address if the application has access to the `email` claim and the user's *public* email address otherwise
-| `email_verified` | `boolean` | Whether the user's email address was verified
-| `website` | `string` | URL for the user's website
-| `profile` | `string` | URL for the user's GitLab profile
-| `picture` | `string` | URL for the user's GitLab avatar
-| `groups` | `array` | Paths for the groups the user is a member of, either directly or through an ancestor group.
-| `groups_direct` | `array` | Paths for the groups the user is a direct member of.
-| `https://gitlab.org/claims/groups/owner` | `array` | Names of the groups the user is a direct member of with Owner role
-| `https://gitlab.org/claims/groups/maintainer` | `array` | Names of the groups the user is a direct member of with Maintainer role
-| `https://gitlab.org/claims/groups/developer` | `array` | Names of the groups the user is a direct member of with Developer role
+| `sub` | `string` | The ID of the user |
+| `auth_time` | `integer` | The timestamp for the user's last authentication |
+| `name` | `string` | The user's full name |
+| `nickname` | `string` | The user's GitLab username |
+| `email` | `string` | The user's email address<br>This is the user's *primary* email address if the application has access to the `email` claim and the user's *public* email address otherwise |
+| `email_verified` | `boolean` | Whether the user's email address was verified |
+| `website` | `string` | URL for the user's website |
+| `profile` | `string` | URL for the user's GitLab profile |
+| `picture` | `string` | URL for the user's GitLab avatar |
+| `groups` | `array` | Paths for the groups the user is a member of, either directly or through an ancestor group. |
+| `groups_direct` | `array` | Paths for the groups the user is a direct member of. |
+| `https://gitlab.org/claims/groups/owner` | `array` | Names of the groups the user is a direct member of with Owner role |
+| `https://gitlab.org/claims/groups/maintainer` | `array` | Names of the groups the user is a direct member of with Maintainer role |
+| `https://gitlab.org/claims/groups/developer` | `array` | Names of the groups the user is a direct member of with Developer role |
The claims `sub`, `sub_legacy`, `email`, `email_verified` and `groups_direct` are included in the ID token. All other claims are available from the `/oauth/userinfo` endpoint used by OIDC clients.
diff --git a/doc/user/project/integrations/discord_notifications.md b/doc/user/project/integrations/discord_notifications.md
index c9333b879f3..c8a3037aedc 100644
--- a/doc/user/project/integrations/discord_notifications.md
+++ b/doc/user/project/integrations/discord_notifications.md
@@ -6,8 +6,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Discord Notifications service **(FREE)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22684) in GitLab 11.6.
-
The Discord Notifications service sends event notifications from GitLab to the channel for which the webhook was created.
To send GitLab event notifications to a Discord channel, [create a webhook in Discord](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks)
diff --git a/doc/user/project/integrations/github.md b/doc/user/project/integrations/github.md
index 9f1ea3796c6..c07142d6edf 100644
--- a/doc/user/project/integrations/github.md
+++ b/doc/user/project/integrations/github.md
@@ -6,8 +6,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# GitHub project integration **(PREMIUM)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/3836) in GitLab 10.6.
-
You can update GitHub with pipeline status updates from GitLab.
This integration can help you if you use GitLab for CI/CD.
@@ -46,8 +44,7 @@ to configure pipelines to run for open pull requests.
### Static or dynamic status check names
-> - Introduced in GitLab 11.5 with static status check names as an opt-in option.
-> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/9931) in GitLab 12.4 to make static status check names the default behavior for new projects.
+> [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/9931) in GitLab 12.4 to make static status check names the default behavior for new projects.
A status check name can be static or dynamic:
diff --git a/doc/user/project/integrations/gitlab_slack_application.md b/doc/user/project/integrations/gitlab_slack_application.md
index 0d8ea636eba..0a685ad0efb 100644
--- a/doc/user/project/integrations/gitlab_slack_application.md
+++ b/doc/user/project/integrations/gitlab_slack_application.md
@@ -6,9 +6,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# GitLab Slack application **(FREE SAAS)**
-> - Introduced in GitLab 9.4.
-> - Distributed to Slack App Directory in GitLab 10.2.
-
NOTE:
The GitLab Slack application is only configurable for GitLab.com. It will **not**
work for on-premises installations where you can configure the
diff --git a/doc/user/project/integrations/hangouts_chat.md b/doc/user/project/integrations/hangouts_chat.md
index 7a96bb74e3f..fbfa7d914a5 100644
--- a/doc/user/project/integrations/hangouts_chat.md
+++ b/doc/user/project/integrations/hangouts_chat.md
@@ -6,8 +6,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Google Chat integration **(FREE)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/43756) in GitLab 11.2.
-
Integrate your project to send notifications from GitLab to a
room of your choice in [Google Chat](https://chat.google.com/) (former Google
Hangouts).
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index e0405955d3d..95a1f3ef3e0 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -135,8 +135,6 @@ in your GitLab projects.
## Filter push events by branch
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/20338) in GitLab 11.3.
-
Push events can be filtered by branch using a branch name or wildcard pattern
to limit which push events are sent to your webhook endpoint. By default,
all push events are sent to your webhook endpoint. You can configure branch filtering
@@ -159,8 +157,6 @@ GitLab webhooks, keep in mind the following:
## How image URLs are displayed in the webhook body
-> Introduced in GitLab 11.2.
-
Relative image references are rewritten to use an absolute URL
in the body of a webhook.
For example, if an image, merge request, comment, or wiki page includes the
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e27c5524eca..8b483d291c2 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -24519,6 +24519,12 @@ msgstr ""
msgid "OnDemandScans|%{learnMoreLinkStart}Learn more about on-demand scans%{learnMoreLinkEnd}."
msgstr ""
+msgid "OnDemandScans|Are you sure you want to delete this scan?"
+msgstr ""
+
+msgid "OnDemandScans|Could not delete saved scan. Please refresh the page, or try again later."
+msgstr ""
+
msgid "OnDemandScans|Could not fetch on-demand scans. Please refresh the page, or try again later."
msgstr ""
@@ -24537,12 +24543,18 @@ msgstr ""
msgid "OnDemandScans|Create new site profile"
msgstr ""
+msgid "OnDemandScans|Delete profile"
+msgstr ""
+
msgid "OnDemandScans|Description (optional)"
msgstr ""
msgid "OnDemandScans|Edit on-demand DAST scan"
msgstr ""
+msgid "OnDemandScans|Edit profile"
+msgstr ""
+
msgid "OnDemandScans|For example: Tests the login page for SQL injections"
msgstr ""
@@ -24585,6 +24597,9 @@ msgstr ""
msgid "OnDemandScans|Repeats"
msgstr ""
+msgid "OnDemandScans|Run scan"
+msgstr ""
+
msgid "OnDemandScans|Save and run scan"
msgstr ""
diff --git a/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js b/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js
index d7261784edc..0c6ed998747 100644
--- a/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js
+++ b/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js
@@ -110,14 +110,23 @@ describe('SetStatusModalWrapper', () => {
});
describe('improvedEmojiPicker is true', () => {
+ const getEmojiPicker = () => wrapper.findComponent(EmojiPicker);
+
beforeEach(async () => {
await initEmojiMock();
wrapper = createComponent({}, true);
return initModal();
});
+ it('renders emoji picker dropdown with custom positioning', () => {
+ expect(getEmojiPicker().props()).toMatchObject({
+ right: false,
+ boundary: 'viewport',
+ });
+ });
+
it('sets emojiTag when clicking in emoji picker', async () => {
- await wrapper.findComponent(EmojiPicker).vm.$emit('click', 'thumbsup');
+ await getEmojiPicker().vm.$emit('click', 'thumbsup');
expect(wrapper.vm.emojiTag).toContain('data-name="thumbsup"');
});
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 10:01:57 +0300