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:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-26 03:10:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-26 03:10:01 +0300
commit84e29d97287715443ac17a0c75cbbde640808697 (patch)
tree5e9cfc1fb3ff23ea1fc362081a0513566ddfc6ab
parent4d0bc99be4b963effecd4f20cc2fc5b0bb34ab46 (diff)
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--app/assets/javascripts/work_items/graphql/provider.js2
-rw-r--r--app/assets/javascripts/work_items/pages/work_item_root.vue6
-rw-r--r--locale/gitlab.pot12
3 files changed, 12 insertions, 8 deletions
diff --git a/app/assets/javascripts/work_items/graphql/provider.js b/app/assets/javascripts/work_items/graphql/provider.js
index dae663433a6..2547b81bbd2 100644
--- a/app/assets/javascripts/work_items/graphql/provider.js
+++ b/app/assets/javascripts/work_items/graphql/provider.js
@@ -40,7 +40,7 @@ export function createApolloProvider() {
type: 'TITLE',
enabled: true,
// eslint-disable-next-line @gitlab/require-i18n-strings
- contentText: 'Test',
+ contentText: 'Test Work Item Title',
},
],
},
diff --git a/app/assets/javascripts/work_items/pages/work_item_root.vue b/app/assets/javascripts/work_items/pages/work_item_root.vue
index e2ae15e0c7c..493ee0aba01 100644
--- a/app/assets/javascripts/work_items/pages/work_item_root.vue
+++ b/app/assets/javascripts/work_items/pages/work_item_root.vue
@@ -36,7 +36,11 @@ export default {
<section>
<!-- Title widget placeholder -->
<div>
- <h2 v-if="titleWidgetData" class="title" data-testid="title">
+ <h2
+ v-if="titleWidgetData"
+ class="gl-font-weight-normal gl-sm-font-weight-bold gl-my-5"
+ data-testid="title"
+ >
{{ titleWidgetData.contentText }}
</h2>
</div>
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 85c9662c802..b1425ca794d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -15602,6 +15602,9 @@ msgstr ""
msgid "GitLab project export"
msgstr ""
+msgid "GitLab runs a background job to export pseudonymized CSVs of the GitLab database. The CSV files are then uploaded to your configured object storage directory."
+msgstr ""
+
msgid "GitLab single sign-on URL"
msgstr ""
@@ -15617,9 +15620,6 @@ msgstr ""
msgid "GitLab version"
msgstr ""
-msgid "GitLab will run a background job that will produce pseudonymized CSVs of the GitLab database that will be uploaded to your configured object storage directory."
-msgstr ""
-
msgid "GitLab.com"
msgstr ""
@@ -27808,6 +27808,9 @@ msgstr ""
msgid "Proxy support for this API is not available currently"
msgstr ""
+msgid "Pseudonymized data collection is disabled. When enabled, GitLab runs a background job to export pseudonymized CSVs of the GitLab database. The CSV files are then uploaded to your configured object storage directory."
+msgstr ""
+
msgid "Pseudonymizer data collection"
msgstr ""
@@ -34204,9 +34207,6 @@ msgstr ""
msgid "The project was successfully imported."
msgstr ""
-msgid "The pseudonymizer data collection is disabled. When enabled, GitLab will run a background job that will produce pseudonymized CSVs of the GitLab database that will be uploaded to your configured object storage directory."
-msgstr ""
-
msgid "The regular expression used to find test coverage output in the job log. For example, use %{regex} for Simplecov (Ruby). Leave blank to disable."
msgstr ""