From b3a736ed88a1db0391cd9881e70b987bab7d89d1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 14 Feb 2020 15:09:08 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../ide/components/commit_sidebar/actions.vue | 2 +- .../new_merge_request_option.vue | 34 +++- .../components/commit_sidebar/radio_group.vue | 2 +- .../ide/components/nav_dropdown.vue | 10 +- .../ide/components/nav_dropdown_button.vue | 11 +- .../javascripts/ide/components/nav_form.vue | 10 +- app/assets/javascripts/ide/constants.js | 3 + .../queries/getUserPermissions.query.graphql | 8 + app/assets/javascripts/ide/services/gql.js | 8 + app/assets/javascripts/ide/services/index.js | 23 ++- .../ide/stores/actions/merge_request.js | 14 +- app/assets/javascripts/ide/stores/getters.js | 16 +- .../ide/stores/modules/commit/actions.js | 2 +- .../ide/stores/modules/commit/getters.js | 6 + .../pages/admin/application_settings/index.js | 4 +- .../repository/components/table/index.vue | 7 +- .../repository/components/table/row.vue | 8 +- app/assets/stylesheets/page_bundles/ide.scss | 2 +- .../admin/application_settings_controller.rb | 24 --- app/services/projects/lsif_data_service.rb | 17 +- .../metrics_and_profiling.html.haml | 3 +- app/views/projects/_home_panel.html.haml | 4 +- .../projects/tree/_tree_content.html.haml | 2 +- .../projects/tree/_tree_header.html.haml | 17 +- ...-ide-button-missing-from-project-pages.yml | 5 + ...sing_disable_enforced_sso_plan_expires.yml | 5 + ...tsov-fix-group-import-visibility-level.yml | 6 + .../refactoring-entities-file-27.yml | 5 + .../refactoring-entities-file-29.yml | 5 + .../remove-self-monitoring-feature-flag.yml | 5 + doc/development/go_guide/index.md | 1 + lib/api/entities.rb | 44 ----- lib/api/entities/application.rb | 13 ++ lib/api/entities/application_with_secret.rb | 10 ++ lib/api/entities/blob.rb | 20 +++ lib/api/entities/custom_attribute.rb | 10 ++ .../pages_domain_certificate_expiration.rb | 10 ++ lib/api/entities/user_agent_detail.rb | 11 ++ lib/api/group_import.rb | 15 +- .../import_export/group_import_export.yml | 1 + .../import_export/group_tree_restorer.rb | 13 +- locale/gitlab.pot | 6 +- qa/qa/page/project/show.rb | 35 +++- qa/qa/resource/api_fabricator.rb | 6 +- qa/qa/resource/fork.rb | 52 +++++- qa/qa/resource/merge_request_from_fork.rb | 2 +- qa/qa/resource/project.rb | 33 ++++ qa/qa/runtime/env.rb | 4 + .../merge_merge_request_from_fork_spec.rb | 2 +- .../move_project_create_fork_spec.rb | 53 ++++++ .../user_sees_collaboration_links_spec.rb | 106 +++++++---- .../visibility_levels/internal/group.json | 166 ++++++++++++++++++ .../visibility_levels/private/group.json | 166 ++++++++++++++++++ .../visibility_levels/public/group.json | 166 ++++++++++++++++++ spec/fixtures/lsif.json.gz | Bin 739 -> 759 bytes spec/frontend/ide/mock_data.js | 1 + spec/frontend/ide/services/index_spec.js | 31 +++- spec/frontend/ide/stores/getters_spec.js | 36 ++++ .../table/__snapshots__/row_spec.js.snap | 2 + .../new_merge_request_option_spec.js | 53 ++++-- .../components/nav_dropdown_button_spec.js | 104 +++++++---- .../ide/components/nav_dropdown_spec.js | 30 ++++ .../ide/stores/actions/merge_request_spec.js | 18 +- .../ide/stores/modules/commit/actions_spec.js | 5 +- .../import_export/group_tree_restorer_spec.rb | 27 +++ .../import_export/group_tree_saver_spec.rb | 2 +- spec/requests/api/group_import_spec.rb | 36 ++++ spec/requests/api/lsif_data_spec.rb | 6 +- spec/requests/api/merge_requests_spec.rb | 102 +++++------ spec/requests/self_monitoring_project_spec.rb | 24 +-- .../projects/lsif_data_service_spec.rb | 25 ++- spec/support/helpers/api_helpers.rb | 7 + .../self_monitoring_shared_examples.rb | 18 -- .../tree/_tree_header.html.haml_spec.rb | 13 +- 74 files changed, 1429 insertions(+), 324 deletions(-) create mode 100644 app/assets/javascripts/ide/queries/getUserPermissions.query.graphql create mode 100644 app/assets/javascripts/ide/services/gql.js create mode 100644 changelogs/unreleased/35428-web-ide-button-missing-from-project-pages.yml create mode 100644 changelogs/unreleased/dblessing_disable_enforced_sso_plan_expires.yml create mode 100644 changelogs/unreleased/georgekoltsov-fix-group-import-visibility-level.yml create mode 100644 changelogs/unreleased/refactoring-entities-file-27.yml create mode 100644 changelogs/unreleased/refactoring-entities-file-29.yml create mode 100644 changelogs/unreleased/remove-self-monitoring-feature-flag.yml create mode 100644 lib/api/entities/application.rb create mode 100644 lib/api/entities/application_with_secret.rb create mode 100644 lib/api/entities/blob.rb create mode 100644 lib/api/entities/custom_attribute.rb create mode 100644 lib/api/entities/pages_domain_certificate_expiration.rb create mode 100644 lib/api/entities/user_agent_detail.rb create mode 100644 qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/group.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/group.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/group.json diff --git a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue index d9cd4f3acf1..2581c3e9928 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue @@ -70,7 +70,7 @@ export default { :title="$options.currentBranchPermissionsTooltip" > diff --git a/app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue b/app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue index daa44a42765..0812599c25c 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue @@ -1,16 +1,27 @@