From e73f8713812b912b3b0244e99b6a18b9422a2d4d Mon Sep 17 00:00:00 2001 From: Sanad Liaquat Date: Fri, 15 Mar 2019 11:52:39 +0500 Subject: Add Load testing script for artillery.io Also add rake tasks that makes use of existing performance data genertion task. --- CHANGELOG.md | 15 - .../clusters/components/applications.vue | 22 +- app/assets/javascripts/environments/index.js | 3 - .../environments/mixins/canary_callout_mixin.js | 5 - .../environments/mixins/environments_mixin.js | 2 +- .../environments/stores/environments_store.js | 25 - .../javascripts/environments/stores/helpers.js | 8 - .../javascripts/pages/groups/details/index.js | 5 - .../pages/groups/shared/group_details.js | 31 - .../javascripts/pages/groups/shared/group_tabs.js | 136 -- .../javascripts/pages/groups/show/group_tabs.js | 136 ++ app/assets/javascripts/pages/groups/show/index.js | 27 +- app/assets/javascripts/pages/users/user_tabs.js | 1 - .../components/graph/stage_column_component.vue | 5 +- .../mixins/graph_pipeline_bundle_mixin.js | 6 - .../pipelines/mixins/stage_column_mixin.js | 7 - .../pipelines/pipeline_details_bundle.js | 8 +- app/assets/stylesheets/framework/common.scss | 4 - app/assets/stylesheets/pages/projects.scss | 4 + app/assets/stylesheets/pages/settings.scss | 5 +- app/controllers/groups_controller.rb | 36 +- app/helpers/groups_helper.rb | 1 - app/presenters/project_presenter.rb | 10 +- app/validators/sha_validator.rb | 2 +- app/views/layouts/header/_new_dropdown.haml | 2 +- app/views/layouts/nav/_dashboard.html.haml | 2 +- app/views/layouts/nav/sidebar/_group.html.haml | 11 +- app/views/projects/_flash_messages.html.haml | 3 +- app/views/projects/_home_panel.html.haml | 5 +- app/views/projects/blob/_header_content.html.haml | 2 +- app/views/projects/empty.html.haml | 133 +- .../settings/operations/_error_tracking.html.haml | 2 +- .../projects/settings/operations/show.html.haml | 1 - app/views/shared/_file_highlight.html.haml | 2 +- app/views/shared/snippets/_form.html.haml | 6 +- app/views/shared/snippets/_header.html.haml | 8 +- .../unreleased/49863-ingress-ip-loading-state.yml | 5 - ...roject-improve-empty-repository-state-ui-fe.yml | 5 - ...t-fails-sidekiq-undefined-method-import_jid.yml | 5 + .../58149-fix-read-list-board-policy.yml | 6 + .../58927-jupyterhub-fails-to-install.yml | 5 + .../unreleased/fj-58804-fix-bitbucket-import.yml | 5 - .../unreleased/jc-fix-set-project-writable.yml | 5 + changelogs/unreleased/modify_group_policy.yml | 5 + .../security-shared-project-private-group.yml | 5 + changelogs/unreleased/sh-fix-issue-58103.yml | 5 + config/karma.config.js | 34 +- config/routes/group.rb | 1 - config/webpack.config.js | 4 - doc/administration/index.md | 1 - doc/administration/user_settings.md | 35 - doc/api/pipeline_schedules.md | 6 +- doc/api/search.md | 2 +- doc/ci/README.md | 2 +- doc/ci/img/pipelines-goal.png | Bin 0 -> 15284 bytes doc/ci/img/types-of-pipelines.png | Bin 0 -> 12268 bytes doc/ci/merge_request_pipelines/index.md | 46 +- doc/ci/pipelines.md | 410 ++-- doc/development/documentation/styleguide.md | 7 +- doc/development/testing_guide/end_to_end_tests.md | 9 +- doc/gitlab-basics/create-your-ssh-keys.md | 39 +- doc/gitlab-basics/img/profile_settings.png | Bin 0 -> 2842 bytes .../img/profile_settings_ssh_keys.png | Bin 0 -> 16531 bytes .../img/profile_settings_ssh_keys_paste_pub.png | Bin 0 -> 13436 bytes .../img/profile_settings_ssh_keys_title.png | Bin 0 -> 1867 bytes doc/user/permissions.md | 6 - doc/user/profile/img/personal_access_tokens.png | Bin 0 -> 18553 bytes doc/user/profile/personal_access_tokens.md | 18 +- doc/user/project/badges.md | 6 - .../merge_requests/merge_when_pipeline_succeeds.md | 2 +- lib/gitlab/database.rb | 6 +- locale/gitlab.pot | 45 +- locale/uk/gitlab.po | 2252 +++++++------------- qa/.gitignore | 2 +- qa/Rakefile | 22 + qa/load/artillery.yml | 22 + qa/qa.rb | 7 - qa/qa/page/dashboard/projects.rb | 2 + qa/qa/page/dashboard/snippet/index.rb | 21 - qa/qa/page/dashboard/snippet/new.rb | 53 - qa/qa/page/dashboard/snippet/show.rb | 63 - qa/qa/page/main/menu.rb | 5 - qa/qa/resource/snippet.rb | 30 - .../3_create/snippet/create_snippet_spec.rb | 31 - qa/qa/tools/generate_perf_testdata.rb | 12 +- spec/controllers/groups_controller_spec.rb | 37 +- .../projects/clusters/applications_spec.rb | 2 +- .../show/user_sees_git_instructions_spec.rb | 2 +- .../show/user_sees_setup_shortcut_buttons_spec.rb | 58 +- spec/fixtures/api/schemas/board.json | 3 +- spec/fixtures/api/schemas/entities/issue.json | 3 +- .../api/schemas/entities/issue_boards.json | 3 +- .../api/schemas/entities/merge_request_widget.json | 4 +- spec/fixtures/api/schemas/issue.json | 5 +- spec/fixtures/api/schemas/issues.json | 3 +- .../api/schemas/public_api/v4/merge_request.json | 124 -- .../api/schemas/public_api/v4/merge_requests.json | 122 +- .../clusters/components/applications_spec.js | 10 +- .../environments/environments_store_spec.js | 74 +- spec/javascripts/test_bundle.js | 72 +- spec/lib/gitlab/bitbucket_import/importer_spec.rb | 20 +- spec/lib/gitlab/database_spec.rb | 38 - spec/lib/gitlab/request_context_spec.rb | 2 +- ...dd_head_pipeline_for_each_merge_request_spec.rb | 24 +- spec/migrations/migrate_old_artifacts_spec.rb | 32 +- ...er_activities_to_users_last_activity_on_spec.rb | 6 +- spec/migrations/migrate_user_project_view_spec.rb | 6 +- spec/routing/group_routing_spec.rb | 4 - spec/support/api/schema_matcher.rb | 24 +- spec/validators/sha_validator_spec.rb | 9 +- .../settings/operations/show.html.haml_spec.rb | 1 - vendor/jupyter/values.yaml | 4 + 112 files changed, 1775 insertions(+), 2850 deletions(-) delete mode 100644 app/assets/javascripts/environments/mixins/canary_callout_mixin.js delete mode 100644 app/assets/javascripts/environments/stores/helpers.js delete mode 100644 app/assets/javascripts/pages/groups/details/index.js delete mode 100644 app/assets/javascripts/pages/groups/shared/group_details.js delete mode 100644 app/assets/javascripts/pages/groups/shared/group_tabs.js create mode 100644 app/assets/javascripts/pages/groups/show/group_tabs.js delete mode 100644 app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js delete mode 100644 app/assets/javascripts/pipelines/mixins/stage_column_mixin.js delete mode 100644 changelogs/unreleased/49863-ingress-ip-loading-state.yml delete mode 100644 changelogs/unreleased/56833-project-improve-empty-repository-state-ui-fe.yml create mode 100644 changelogs/unreleased/57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid.yml create mode 100644 changelogs/unreleased/58149-fix-read-list-board-policy.yml create mode 100644 changelogs/unreleased/58927-jupyterhub-fails-to-install.yml delete mode 100644 changelogs/unreleased/fj-58804-fix-bitbucket-import.yml create mode 100644 changelogs/unreleased/jc-fix-set-project-writable.yml create mode 100644 changelogs/unreleased/modify_group_policy.yml create mode 100644 changelogs/unreleased/security-shared-project-private-group.yml create mode 100644 changelogs/unreleased/sh-fix-issue-58103.yml delete mode 100644 doc/administration/user_settings.md create mode 100644 doc/ci/img/pipelines-goal.png create mode 100644 doc/ci/img/types-of-pipelines.png create mode 100644 doc/gitlab-basics/img/profile_settings.png create mode 100644 doc/gitlab-basics/img/profile_settings_ssh_keys.png create mode 100644 doc/gitlab-basics/img/profile_settings_ssh_keys_paste_pub.png create mode 100644 doc/gitlab-basics/img/profile_settings_ssh_keys_title.png create mode 100644 doc/user/profile/img/personal_access_tokens.png create mode 100644 qa/load/artillery.yml delete mode 100644 qa/qa/page/dashboard/snippet/index.rb delete mode 100644 qa/qa/page/dashboard/snippet/new.rb delete mode 100644 qa/qa/page/dashboard/snippet/show.rb delete mode 100644 qa/qa/resource/snippet.rb delete mode 100644 qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb delete mode 100644 spec/fixtures/api/schemas/public_api/v4/merge_request.json diff --git a/CHANGELOG.md b/CHANGELOG.md index bec6a8b3e21..8a4a6c9ff13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,21 +2,6 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. -## 11.8.2 (2019-03-13) - -### Security (1 change) - -- Fixed ability to see private groups by users not belonging to given group. - -### Fixed (5 changes) - -- Fix import_jid error on project import. !25239 -- Properly handle multiple X-Forwarded-For addresses in runner IP. !25511 -- Fix error when viewing group issue boards when user doesn't have explicit group permissions. !25524 -- Fix method to mark a project repository as writable. !25546 -- Allow project members to see private group if the project is in the group namespace. - - ## 11.8.0 (2019-02-22) ### Security (7 changes, 1 of them is from the community) diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 5b206b82fe0..13e8617c515 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -1,7 +1,6 @@