Merge remote-tracking branch 'ee/master' into 40622-use-left-right-and-max-count-ee
* ee/master: (129 commits) Update CHANGELOG.md for 10.3.3 Update CHANGELOG-EE.md for 10.3.3-ee use different counts for wiki Add missing wiki counts to prometheus metrics Include the Namespace Id in purchase link for GL.com plans Update LICENSE to clean up formatting Adjust content width for User Settings, Pipeline quota Use add_master instead Copy changes from EE master Fix yarn.lock by `yarn install` Fix package dependency Remove duplicated class Resolve yarn.lock Resolve app/workers/repository_import_worker.rb Resolve app/services/search/global_service.rb Resolve app/views/projects/tree/show.html.haml Resolve app/views/projects/tree/_tree_header.html.haml Resolve app/views/projects/tree/_tree_content.html.haml Resolve app/models/user.rb Resolve app/controllers/autocomplete_controller.rb ...
Showing
- CHANGELOG-EE.md 4 additions, 0 deletionsCHANGELOG-EE.md
- CHANGELOG.md 9 additions, 0 deletionsCHANGELOG.md
- LICENSE 2 additions, 2 deletionsLICENSE
- VERSION 1 addition, 1 deletionVERSION
- app/assets/javascripts/clusters/clusters_bundle.js 2 additions, 0 deletionsapp/assets/javascripts/clusters/clusters_bundle.js
- app/assets/javascripts/clusters/components/applications.vue 20 additions, 0 deletionsapp/assets/javascripts/clusters/components/applications.vue
- app/assets/javascripts/clusters/services/clusters_service.js 1 addition, 0 deletionsapp/assets/javascripts/clusters/services/clusters_service.js
- app/assets/javascripts/clusters/stores/clusters_store.js 7 additions, 0 deletionsapp/assets/javascripts/clusters/stores/clusters_store.js
- app/assets/javascripts/cycle_analytics/components/stage_review_component.vue 6 additions, 1 deletion...pts/cycle_analytics/components/stage_review_component.vue
- app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue 6 additions, 1 deletion...ts/cycle_analytics/components/stage_staging_component.vue
- app/assets/javascripts/cycle_analytics/components/stage_test_component.vue 6 additions, 1 deletion...ripts/cycle_analytics/components/stage_test_component.vue
- app/assets/javascripts/dispatcher.js 3 additions, 1 deletionapp/assets/javascripts/dispatcher.js
- app/assets/javascripts/gl_dropdown.js 8 additions, 16 deletionsapp/assets/javascripts/gl_dropdown.js
- app/assets/javascripts/lib/utils/datetime_utility.js 13 additions, 5 deletionsapp/assets/javascripts/lib/utils/datetime_utility.js
- app/assets/javascripts/monitoring/utils/date_time_formatters.js 1 addition, 1 deletion...sets/javascripts/monitoring/utils/date_time_formatters.js
- app/assets/javascripts/pages/users/show/index.js 3 additions, 0 deletionsapp/assets/javascripts/pages/users/show/index.js
- app/assets/javascripts/pipelines/components/pipelines_artifacts.vue 7 additions, 4 deletions.../javascripts/pipelines/components/pipelines_artifacts.vue
- app/assets/javascripts/preview_markdown.js 3 additions, 3 deletionsapp/assets/javascripts/preview_markdown.js
- app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js 7 additions, 4 deletions...s/vue_merge_request_widget/components/mr_widget_header.js
- app/assets/javascripts/vue_shared/components/commit.vue 6 additions, 5 deletionsapp/assets/javascripts/vue_shared/components/commit.vue
Please register or sign in to comment