Merge branch 'master' into...
Merge branch 'master' into '12918-metrics-dashboard-alerting-menu-unavailable-when-additional-panel-types-is-enabled' # Conflicts: # app/assets/javascripts/monitoring/components/dashboard.vue
Showing
- .eslintrc.yml 3 additions, 3 deletions.eslintrc.yml
- .gitlab-ci.yml 1 addition, 2 deletions.gitlab-ci.yml
- .gitlab/CODEOWNERS 9 additions, 9 deletions.gitlab/CODEOWNERS
- .gitlab/ci/docs.gitlab-ci.yml 5 additions, 5 deletions.gitlab/ci/docs.gitlab-ci.yml
- .gitlab/ci/frontend.gitlab-ci.yml 5 additions, 5 deletions.gitlab/ci/frontend.gitlab-ci.yml
- .gitlab/ci/global.gitlab-ci.yml 2 additions, 2 deletions.gitlab/ci/global.gitlab-ci.yml
- .gitlab/ci/qa.gitlab-ci.yml 16 additions, 4 deletions.gitlab/ci/qa.gitlab-ci.yml
- .gitlab/ci/rails.gitlab-ci.yml 5 additions, 4 deletions.gitlab/ci/rails.gitlab-ci.yml
- .gitlab/ci/review.gitlab-ci.yml 14 additions, 8 deletions.gitlab/ci/review.gitlab-ci.yml
- .gitlab/ci/test-metadata.gitlab-ci.yml 1 addition, 1 deletion.gitlab/ci/test-metadata.gitlab-ci.yml
- .gitlab/issue_templates/Security Release.md 10 additions, 10 deletions.gitlab/issue_templates/Security Release.md
- .gitlab/issue_templates/Security developer workflow.md 1 addition, 1 deletion.gitlab/issue_templates/Security developer workflow.md
- .haml-lint_todo.yml 510 additions, 510 deletions.haml-lint_todo.yml
- .mdlrc.style 7 additions, 0 deletions.mdlrc.style
- .prettierignore 1 addition, 0 deletions.prettierignore
- CHANGELOG-EE.md 52 additions, 0 deletionsCHANGELOG-EE.md
- CHANGELOG.md 68 additions, 0 deletionsCHANGELOG.md
- GITALY_SERVER_VERSION 1 addition, 1 deletionGITALY_SERVER_VERSION
- Gemfile 7 additions, 11 deletionsGemfile
- Gemfile.lock 13 additions, 29 deletionsGemfile.lock
Please register or sign in to comment