Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 0 deletions

diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb
index d73eaed8a0a..f32dfc0dbcf 100644
--- a/app/graphql/types/merge_request_type.rb
+++ b/app/graphql/types/merge_request_type.rb
@@ -223,6 +223,9 @@ module Types
       null: true,
       description: 'List of award emojis associated with the merge request.'
 
+    field :prepared_at, Types::TimeType, null: true,
+                                         description: 'Timestamp of when the merge request was prepared.'
+
     markdown_field :title_html, null: true
     markdown_field :description_html, null: true
 
diff --git a/app/graphql/types/merge_requests/detailed_merge_status_enum.rb b/app/graphql/types/merge_requests/detailed_merge_status_enum.rb
index 1ba72ae33b5..e7246068a05 100644
--- a/app/graphql/types/merge_requests/detailed_merge_status_enum.rb
+++ b/app/graphql/types/merge_requests/detailed_merge_status_enum.rb
@@ -45,6 +45,9 @@ module Types
       value 'EXTERNAL_STATUS_CHECKS',
             value: :status_checks_must_pass,
             description: 'Status checks must pass.'
+      value 'PREPARING',
+            value: :preparing,
+            description: 'Merge request diff is being created.'
     end
   end
 end