From 4584eb0e07d372d6014de16ab359965475184c99 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Sep 2019 15:06:03 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/import_projects_table.vue | 45 ++++++++++-- .../javascripts/import_projects/index.js | 2 +- .../import_projects/store/actions.js | 22 ++++-- .../import_projects/store/getters.js | 5 ++ .../import_projects/store/mutation_types.js | 2 + .../import_projects/store/mutations.js | 4 ++ .../import_projects/store/state.js | 1 + app/controllers/import/github_controller.rb | 21 +++++- ...ekoltsov-add-github-importer-filtering.yml | 5 ++ doc/user/project/import/gitea.md | 10 ++- doc/user/project/import/github.md | 5 +- ...ort_projects_from_gitea_importer_v12_3.png | Bin 0 -> 50650 bytes .../import_projects_from_github_importer.png | Bin 17953 -> 0 bytes ...rt_projects_from_github_importer_v12_3.png | Bin 0 -> 53497 bytes .../analytics/cycle_analytics/stage_events.rb | 6 +- .../stage_events/code_stage_start.rb | 15 ++++ .../stage_events/issue_created.rb | 4 ++ .../issue_first_mentioned_in_commit.rb | 10 +++ .../stage_events/issue_stage_end.rb | 13 ++++ .../stage_events/merge_request_created.rb | 4 ++ ...ge_request_first_deployed_to_production.rb | 10 +++ .../merge_request_last_build_finished.rb | 10 +++ .../merge_request_last_build_started.rb | 10 +++ .../stage_events/merge_request_merged.rb | 10 +++ .../stage_events/plan_stage_start.rb | 16 +++++ .../stage_events/production_stage_end.rb | 33 +++++++++ .../stage_events/stage_event.rb | 17 +++++ locale/gitlab.pot | 4 +- .../components/import_projects_table_spec.js | 8 ++- .../import_projects/store/actions_spec.js | 64 ++++++++++++++++-- .../stage_events/code_stage_start_spec.rb | 22 ++++++ .../stage_events/issue_created_spec.rb | 7 ++ .../issue_first_mentioned_in_commit_spec.rb | 7 ++ .../stage_events/issue_stage_end_spec.rb | 7 ++ .../merge_request_created_spec.rb | 7 ++ ...quest_first_deployed_to_production_spec.rb | 7 ++ .../merge_request_last_build_finished_spec.rb | 7 ++ .../merge_request_last_build_started_spec.rb | 7 ++ .../stage_events/merge_request_merged_spec.rb | 7 ++ .../stage_events/plan_stage_start_spec.rb | 24 +++++++ .../stage_events/stage_event_spec.rb | 7 +- ...ubish_import_controller_shared_examples.rb | 32 +++++++++ .../cycle_analytics_event_shared_examples.rb | 19 ++++++ 43 files changed, 485 insertions(+), 31 deletions(-) create mode 100644 changelogs/unreleased/georgekoltsov-add-github-importer-filtering.yml create mode 100644 doc/user/project/import/img/import_projects_from_gitea_importer_v12_3.png delete mode 100644 doc/user/project/import/img/import_projects_from_github_importer.png create mode 100644 doc/user/project/import/img/import_projects_from_github_importer_v12_3.png create mode 100644 lib/gitlab/analytics/cycle_analytics/stage_events/production_stage_end.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_created_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_first_mentioned_in_commit_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/issue_stage_end_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_created_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_first_deployed_to_production_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_last_build_finished_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_last_build_started_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/merge_request_merged_spec.rb create mode 100644 spec/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start_spec.rb create mode 100644 spec/support/shared_examples/cycle_analytics_event_shared_examples.rb diff --git a/app/assets/javascripts/import_projects/components/import_projects_table.vue b/app/assets/javascripts/import_projects/components/import_projects_table.vue index 00eb0afb3bf..e5ac3cbafe5 100644 --- a/app/assets/javascripts/import_projects/components/import_projects_table.vue +++ b/app/assets/javascripts/import_projects/components/import_projects_table.vue @@ -1,4 +1,5 @@