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>2023-03-29 12:10:35 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-29 12:10:35 +0300
commit55dea17c8d10d1b25cd25f1cdaeaed64332995a7 (patch)
treed8deec499e9aacae38b95cb509f9dc7873b0652a /doc/development/fe_guide
parentf0224e32ca39fe7b261a8d6bcec64bb449c65856 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/fe_guide')
-rw-r--r--doc/development/fe_guide/merge_request_widget_extensions.md1
-rw-r--r--doc/development/fe_guide/vue.md2
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/development/fe_guide/merge_request_widget_extensions.md b/doc/development/fe_guide/merge_request_widget_extensions.md
index 4242dd837f8..07029aec015 100644
--- a/doc/development/fe_guide/merge_request_widget_extensions.md
+++ b/doc/development/fe_guide/merge_request_widget_extensions.md
@@ -329,7 +329,6 @@ To generate these known events for a single widget:
1. `product_section` = `dev`
1. `product_stage` = `create`
1. `product_group` = `code_review`
- 1. `product_category` = `code_review`
1. `introduced_by_url` = `'[your MR]'`
1. `options.events` = (the event in the command from above that generated this file, like `i_code_review_merge_request_widget_test_reports_count_view`)
- This value is how the telemetry events are linked to "metrics" so this is probably one of the more important values.
diff --git a/doc/development/fe_guide/vue.md b/doc/development/fe_guide/vue.md
index 4954c7fe86f..b8dcf1c336f 100644
--- a/doc/development/fe_guide/vue.md
+++ b/doc/development/fe_guide/vue.md
@@ -121,7 +121,7 @@ export default {
```javascript
//index.js
import MyComponent from './my_component.vue'
-import initSimpleApp from '~/helpers/init_simple_app_helper'
+import { initSimpleApp } from '~/helpers/init_simple_app_helper'
initSimpleApp('#js-my-element', MyComponent)
```