Add latest changes from gitlab-org/gitlab@master

8 files changed, 7 insertions, 8 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/records_fetcher.rb b/lib/gitlab/analytics/cycle_analytics/records_fetcher.rb
index 2662aa38d6b..e8e269a88f0 100644
--- a/lib/gitlab/analytics/cycle_analytics/records_fetcher.rb
+++ b/lib/gitlab/analytics/cycle_analytics/records_fetcher.rb
@@ -21,7 +21,7 @@ module Gitlab
             finder_class: MergeRequestsFinder,
             serializer_class: AnalyticsMergeRequestSerializer,
             includes_for_query: { target_project: [:namespace], author: [] },
-            columns_for_select: %I[title iid id created_at author_id state target_project_id]
+            columns_for_select: %I[title iid id created_at author_id state_id target_project_id]
           }
         }.freeze
 
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb
index 93c6fdcf69c..af50a27c47b 100644
--- a/lib/gitlab/bitbucket_server_import/importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importer.rb
@@ -200,7 +200,6 @@ module Gitlab
           target_project_id: project.id,
           target_branch: Gitlab::Git.ref_name(pull_request.target_branch_name),
           target_branch_sha: pull_request.target_branch_sha,
-          state: pull_request.state,
           state_id: MergeRequest.available_states[pull_request.state],
           author_id: author_id,
           assignee_id: nil,
diff --git a/lib/gitlab/cycle_analytics/code_event_fetcher.rb b/lib/gitlab/cycle_analytics/code_event_fetcher.rb
index fcc282bf7a6..d75da76415a 100644
--- a/lib/gitlab/cycle_analytics/code_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/code_event_fetcher.rb
@@ -10,7 +10,7 @@ module Gitlab
                         mr_table[:iid],
                         mr_table[:id],
                         mr_table[:created_at],
-                        mr_table[:state],
+                        mr_table[:state_id],
                         mr_table[:author_id]]
         @order = mr_table[:created_at]
 
diff --git a/lib/gitlab/cycle_analytics/review_event_fetcher.rb b/lib/gitlab/cycle_analytics/review_event_fetcher.rb
index 4b5d79097b7..f5f8c19683d 100644
--- a/lib/gitlab/cycle_analytics/review_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/review_event_fetcher.rb
@@ -10,7 +10,7 @@ module Gitlab
                         mr_table[:iid],
                         mr_table[:id],
                         mr_table[:created_at],
-                        mr_table[:state],
+                        mr_table[:state_id],
                         mr_table[:author_id]]
 
         super(*args)
diff --git a/lib/gitlab/github_import/importer/issue_importer.rb b/lib/gitlab/github_import/importer/issue_importer.rb
index a468f6d8821..8648cbaec9d 100644
--- a/lib/gitlab/github_import/importer/issue_importer.rb
+++ b/lib/gitlab/github_import/importer/issue_importer.rb
@@ -52,7 +52,6 @@ module Gitlab
             project_id: project.id,
             description: description,
             milestone_id: milestone_finder.id_for(issue),
-            state: issue.state,
             state_id: ::Issue.available_states[issue.state],
             created_at: issue.created_at,
             updated_at: issue.updated_at
diff --git a/lib/gitlab/github_import/importer/pull_request_importer.rb b/lib/gitlab/github_import/importer/pull_request_importer.rb
index 377e873d24d..dc15b95505a 100644
--- a/lib/gitlab/github_import/importer/pull_request_importer.rb
+++ b/lib/gitlab/github_import/importer/pull_request_importer.rb
@@ -54,7 +54,6 @@ module Gitlab
             target_project_id: project.id,
             source_branch: pull_request.formatted_source_branch,
             target_branch: pull_request.target_branch,
-            state: pull_request.state,
             state_id: ::MergeRequest.available_states[pull_request.state],
             milestone_id: milestone_finder.id_for(pull_request),
             author_id: author_id,
diff --git a/lib/gitlab/hook_data/merge_request_builder.rb b/lib/gitlab/hook_data/merge_request_builder.rb
index 0678799b64b..ae2ec424ce5 100644
--- a/lib/gitlab/hook_data/merge_request_builder.rb
+++ b/lib/gitlab/hook_data/merge_request_builder.rb
@@ -23,7 +23,7 @@ module Gitlab
           milestone_id
           source_branch
           source_project_id
-          state
+          state_id
           target_branch
           target_project_id
           time_estimate
@@ -53,7 +53,8 @@ module Gitlab
           human_total_time_spent: merge_request.human_total_time_spent,
           human_time_estimate: merge_request.human_time_estimate,
           assignee_ids: merge_request.assignee_ids,
-          assignee_id: merge_request.assignee_ids.first # This key is deprecated
+          assignee_id: merge_request.assignee_ids.first, # This key is deprecated
+          state: merge_request.state # This key is deprecated
         }
 
         merge_request.attributes.with_indifferent_access.slice(*self.class.safe_hook_attributes)
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index d491f45b0da..64bf40b50c2 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -275,3 +275,4 @@ ee:
         - :unprotect_access_levels
       - protected_environments:
         - :deploy_access_levels
+      - :service_desk_setting