Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/30881-webide-mr-confirmation.yml

+---
+title: 'Fix Issue: WebIDE asks for confirmation to leave the page when committing
+  and creating a new MR'
+merge_request: 17671
+author:
+type: fixed

changelogs/unreleased/32133-remove-feature-flag-for-zoom.yml

+---
+title: Allow users to add and remove zoom rooms on an issue using quick action commands
+merge_request:
+author:
+type: added

changelogs/unreleased/fork_gitlab_ci.yml

+---
+title: Preserve custom .gitlab-ci.yml config path when forking.
+merge_request: 17817
+author: Mathieu Parent
+type: added

changelogs/unreleased/internationalization-time-series-wrapper.yml

+---
+title: Provides internationalization support to chart legends
+merge_request: 16832
+author:
+type: added

changelogs/unreleased/issue_11241.yml

+---
+title: Expose web_url for epics on API
+merge_request: 17380
+author:
+type: added

doc/api/epics.md

@@ -67,7 +67,7 @@ Example response:
   "title": "Accusamus iste et ullam ratione voluptatem omnis debitis dolor est.",
   "description": "Molestias dolorem eos vitae expedita impedit necessitatibus quo voluptatum.",
   "state": "opened",
-  "web_edit_url": "http://localhost:3001/groups/test/-/epics/4",
+  "web_url": "http://localhost:3001/groups/test/-/epics/4",
   "reference": "&4",
   "author": {
     "id": 10,
@@ -122,7 +122,7 @@ Example response:
   "title": "Ea cupiditate dolores ut vero consequatur quasi veniam voluptatem et non.",
   "description": "Molestias dolorem eos vitae expedita impedit necessitatibus quo voluptatum.",
   "state": "opened",
-  "web_edit_url": "http://localhost:3001/groups/test/-/epics/5",
+  "web_url": "http://localhost:3001/groups/test/-/epics/5",
   "reference": "&5",
   "author":{
     "id": 7,
@@ -188,7 +188,7 @@ Example response:
   "title": "Epic",
   "description": "Epic description",
   "state": "opened",
-  "web_edit_url": "http://localhost:3001/groups/test/-/epics/6",
+  "web_url": "http://localhost:3001/groups/test/-/epics/5",
   "reference": "&6",
   "author": {
     "name" : "Alexandra Bashirian",
@@ -255,7 +255,7 @@ Example response:
   "title": "New Title",
   "description": "Epic description",
   "state": "opened",
-  "web_edit_url": "http://localhost:3001/groups/test/-/epics/6",
+  "web_url": "http://localhost:3001/groups/test/-/epics/5",
   "reference": "&6",
   "author": {
     "name" : "Alexandra Bashirian",

doc/user/project/quick_actions.md

@@ -64,8 +64,8 @@ The following quick actions are applicable to descriptions, discussions and thre
 | `/create_merge_request <branch name>` | ✓     |               |      | Create a new merge request starting from the current issue |
 | `/relate #issue1 #issue2`             | ✓     |               |      | Mark issues as related **(STARTER)** |
 | `/move <path/to/project>`             | ✓     |               |      | Move this issue to another project |
-| `/zoom <Zoom URL>`                    | ✓     |               |      | Add Zoom meeting to this issue. ([Introduced in GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/merge_requests/16609). Must be enabled by feature flag `issue_zoom_integration` for self-hosted. [Feature flag to be removed and available by default in 12.4.](https://gitlab.com/gitlab-org/gitlab/issues/32133)) |
-| `/remove_zoom`                        | ✓     |               |      | Remove Zoom meeting from this issue. ([Introduced in GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/merge_requests/16609). Must be enabled by feature flag `issue_zoom_integration` for self-hosted. [Feature flag to be removed and available by default in 12.4.](https://gitlab.com/gitlab-org/gitlab/issues/32133)) |
+| `/zoom <Zoom URL>`                    | ✓     |               |      | Add Zoom meeting to this issue. |
+| `/remove_zoom`                        | ✓     |               |      | Remove Zoom meeting from this issue. |
 | `/target_branch <local branch name>`  |       | ✓             |      | Set target branch |
 | `/wip`                                |       | ✓             |      | Toggle the Work In Progress status |
 | `/approve`                            |       | ✓             |      | Approve the merge request |

locale/gitlab.pot

@@ -9858,6 +9858,9 @@ msgstr ""
 msgid "Metrics|Add metric"
 msgstr ""
+msgid "Metrics|Avg"
+msgstr ""
+
 msgid "Metrics|Check out the CI/CD documentation on deploying to an environment"
 msgstr ""
@@ -9888,6 +9891,9 @@ msgstr ""
 msgid "Metrics|Legend label (optional)"
 msgstr ""
+msgid "Metrics|Max"
+msgstr ""
+
 msgid "Metrics|Must be a valid PromQL query."
 msgstr ""
@@ -15833,7 +15839,7 @@ msgstr ""
 msgid "There was an error fetching configuration for charts"
 msgstr ""
-msgid "There was an error fetching the form data"
+msgid "There was an error fetching data for the form"
 msgstr ""
 msgid "There was an error gathering the chart data"

qa/knapsack/gitlab-ce/review-qa-all_master_report.json

-{
-  "qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb": 9.697327613830566,
-  "qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb": 46.54227638244629,
-  "qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb": 10.214765310287476,
-  "qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb": 7.882027864456177,
-  "qa/specs/features/api/3_create/repository/files_spec.rb": 5.015859127044678,
-  "qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb": 12.772682905197144,
-  "qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb": 29.76174831390381,
-  "qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb": 22.800872802734375,
-  "qa/specs/features/browser_ui/1_manage/login/register_spec.rb": 22.320587396621704,
-  "qa/specs/features/api/1_manage/users_spec.rb": 0.6089541912078857,
-  "qa/specs/features/browser_ui/3_create/repository/clone_spec.rb": 0.9618203639984131,
-  "qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb": 13.403101205825806,
-  "qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb": 8.810423135757446,
-  "qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb": 7.730542182922363,
-  "qa/specs/features/browser_ui/3_create/repository/add_ssh_key_spec.rb": 16.18057894706726,
-  "qa/specs/features/browser_ui/4_verify/ci_variable/add_ci_variable_spec.rb": 8.31815505027771,
-  "qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb": 9.48607873916626,
-  "qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb": 19.552733182907104,
-  "qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb": 17.273863554000854,
-  "qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb": 8.281434059143066,
-  "qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb": 18.047621726989746,
-  "qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb": 7.422840595245361,
-  "qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb": 3.438166856765747,
-  "qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb": 18.679633855819702,
-  "qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb": 27.943300485610962,
-  "qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb": 39.17585229873657,
-  "qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb": 40.09336972236633,
-  "qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb": 3.705310821533203,
-  "qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb": 5.812374591827393,
-  "qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb": 92.46774697303772,
-  "qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb": 100.28881478309631,
-  "qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb": 23.710937023162842,
-  "qa/specs/features/browser_ui/1_manage/login/login_via_oauth_spec.rb": 20.58603596687317,
-  "qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb": 25.460349321365356,
-  "qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb": 19.459370374679565,
-  "qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb": 6.731764793395996,
-  "qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb": 15.342933893203735,
-  "qa/specs/features/browser_ui/2_plan/issue/issue_suggestions_spec.rb": 11.280649185180664,
-  "qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb": 57.48992609977722,
-  "qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb": 32.5517954826355
-}
\ No newline at end of file

qa/qa/ce/knapsack/nightly_master_report.json → qa/knapsack/master_report.json

 {
+  "qa/specs/features/ee/api/2_plan/epics_milestone_dates_spec.rb": 4.835599899291992,
+  "qa/specs/features/ee/browser_ui/2_plan/epic/epics_management_spec.rb": 69.85551619529724,
+  "qa/specs/features/ee/browser_ui/2_plan/epic/promote_issue_to_epic_spec.rb": 14.649160623550415,
+  "qa/specs/features/ee/browser_ui/2_plan/scoped_labels/editing_scoped_labels_spec.rb": 12.790381908416748,
+  "qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb": 0.00018262863159179688,
+  "qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb": 59.73394823074341,
+  "qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb": 26.39240026473999,
+  "qa/specs/features/ee/browser_ui/secure/create_project_with_secure_spec.rb": 46.76790499687195,
   "qa/specs/features/api/1_manage/users_spec.rb": 0.6089541912078857,
   "qa/specs/features/api/3_create/repository/files_spec.rb": 5.015859127044678,
   "qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb": 1.0199065208435059,

qa/qa/page/main/menu.rb

@@ -20,6 +20,7 @@ module QA
           element :admin_area_link
           element :projects_dropdown, required: true
           element :groups_dropdown, required: true
+          element :more_dropdown, required: true
           element :snippets_link
         end
@@ -52,6 +53,13 @@ module QA
           end
         end
+        def go_to_snippets
+          within_top_menu do
+            click_element :more_dropdown
+            click_element :snippets_link
+          end
+        end
+
         def click_admin_area
           within_top_menu { click_element :admin_area_link }
         end
@@ -80,10 +88,6 @@ module QA
           end
         end
-        def click_snippets_link
-          click_element :snippets_link
-        end
-
         def search_for(term)
           fill_element :search_term_field, "#{term}\n"
         end

qa/qa/specs/features/browser_ui/3_create/snippet/create_snippet_spec.rb

@@ -7,7 +7,7 @@ module QA
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)
-        Page::Main::Menu.perform(&:click_snippets_link)
+        Page::Main::Menu.perform(&:go_to_snippets)
         Resource::Snippet.fabricate_via_browser_ui! do |snippet|
           snippet.title = 'Snippet title'

spec/helpers/application_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ApplicationHelper do

spec/helpers/auto_devops_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AutoDevopsHelper do

spec/helpers/avatars_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AvatarsHelper do

spec/helpers/award_emoji_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AwardEmojiHelper do

spec/helpers/blame_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BlameHelper do

spec/helpers/blob_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BlobHelper do

spec/helpers/boards_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BoardsHelper do

spec/helpers/broadcast_messages_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BroadcastMessagesHelper do