Add latest changes from gitlab-org/gitlab@master

10 files changed, 79 insertions, 41 deletions

diff --git a/changelogs/unreleased/refactoring-entities-file-13.yml b/changelogs/unreleased/refactoring-entities-file-13.yml
new file mode 100644
index 00000000000..49d578fd979
--- /dev/null
+++ b/changelogs/unreleased/refactoring-entities-file-13.yml
@@ -0,0 +1,5 @@
+---
+title: Separate note entities into own class files
+merge_request: 24732
+author: Rajendra Kadam
+type: added
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index 650e797324a..2f80dd66548 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -209,7 +209,11 @@ praefect['database_dbname'] = 'praefect_production'
 Replace `POSTGRESQL_SERVER_ADDRESS`, `PRAEFECT_EXTERNAL_TOKEN`, `PRAEFECT_INTERNAL_TOKEN`,
 and `PRAEFECT_SQL_PASSWORD` with their respective values.
 
-Save the file and [reconfigure Praefect](../restart_gitlab.md#omnibus-gitlab-reconfigure).
+Save the file and reconfigure Praefect:
+
+```shell
+sudo gitlab-ctl reconfigure
+```
 
 After you reconfigure, verify that Praefect can reach PostgreSQL:
 
@@ -328,7 +332,11 @@ with their respective values.
 Note that the storage name used is the same as the `praefect['virtual_storage_name']` set
 on the Praefect node.
 
-Save your changes and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
+Save your changes and reconfigure GitLab:
+
+```shell
+sudo gitlab-ctl reconfigure
+```
 
 Run `sudo gitlab-rake gitlab:gitaly:check` to confirm that GitLab can reach Praefect.
 
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 122b2c40623..98c0f78de1f 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -129,40 +129,6 @@ module API
       end
     end
 
-    class Avatar < Grape::Entity
-      expose :avatar_url do |avatarable, options|
-        avatarable.avatar_url(only_path: false, size: options[:size])
-      end
-    end
-
-    class AwardEmoji < Grape::Entity
-      expose :id
-      expose :name
-      expose :user, using: Entities::UserBasic
-      expose :created_at, :updated_at
-      expose :awardable_id, :awardable_type
-    end
-
-    class MRNote < Grape::Entity
-      expose :note
-      expose :author, using: Entities::UserBasic
-    end
-
-    class CommitNote < Grape::Entity
-      expose :note
-      expose(:path) { |note| note.diff_file.try(:file_path) if note.diff_note? }
-      expose(:line) { |note| note.diff_line.try(:new_line) if note.diff_note? }
-      expose(:line_type) { |note| note.diff_line.try(:type) if note.diff_note? }
-      expose :author, using: Entities::UserBasic
-      expose :created_at
-    end
-
-    class CommitStatus < Grape::Entity
-      expose :id, :sha, :ref, :status, :name, :target_url, :description,
-             :created_at, :started_at, :finished_at, :allow_failure, :coverage
-      expose :author, using: Entities::UserBasic
-    end
-
     class PushEventPayload < Grape::Entity
       expose :commit_count, :action, :ref_type, :commit_from, :commit_to, :ref,
              :commit_title, :ref_count
diff --git a/lib/api/entities/avatar.rb b/lib/api/entities/avatar.rb
new file mode 100644
index 00000000000..7d5c762afcc
--- /dev/null
+++ b/lib/api/entities/avatar.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Avatar < Grape::Entity
+      expose :avatar_url do |avatarable, options|
+        avatarable.avatar_url(only_path: false, size: options[:size])
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/award_emoji.rb b/lib/api/entities/award_emoji.rb
new file mode 100644
index 00000000000..da9a183bf39
--- /dev/null
+++ b/lib/api/entities/award_emoji.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class AwardEmoji < Grape::Entity
+      expose :id
+      expose :name
+      expose :user, using: Entities::UserBasic
+      expose :created_at, :updated_at
+      expose :awardable_id, :awardable_type
+    end
+  end
+end
diff --git a/lib/api/entities/commit_note.rb b/lib/api/entities/commit_note.rb
new file mode 100644
index 00000000000..d08b6fc8225
--- /dev/null
+++ b/lib/api/entities/commit_note.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class CommitNote < Grape::Entity
+      expose :note
+      expose(:path) { |note| note.diff_file.try(:file_path) if note.diff_note? }
+      expose(:line) { |note| note.diff_line.try(:new_line) if note.diff_note? }
+      expose(:line_type) { |note| note.diff_line.try(:type) if note.diff_note? }
+      expose :author, using: Entities::UserBasic
+      expose :created_at
+    end
+  end
+end
diff --git a/lib/api/entities/commit_status.rb b/lib/api/entities/commit_status.rb
new file mode 100644
index 00000000000..61b8bf89cfe
--- /dev/null
+++ b/lib/api/entities/commit_status.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class CommitStatus < Grape::Entity
+      expose :id, :sha, :ref, :status, :name, :target_url, :description,
+             :created_at, :started_at, :finished_at, :allow_failure, :coverage
+      expose :author, using: Entities::UserBasic
+    end
+  end
+end
diff --git a/lib/api/entities/mr_note.rb b/lib/api/entities/mr_note.rb
new file mode 100644
index 00000000000..283f7bd1092
--- /dev/null
+++ b/lib/api/entities/mr_note.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class MRNote < Grape::Entity
+      expose :note
+      expose :author, using: Entities::UserBasic
+    end
+  end
+end
diff --git a/package.json b/package.json
index 8081f74c4b7..c259a7dfb68 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@gitlab/ui": "^9.4.1",
     "@gitlab/visual-review-tools": "1.5.1",
     "@sentry/browser": "^5.10.2",
-    "@sourcegraph/code-host-integration": "0.0.29",
+    "@sourcegraph/code-host-integration": "0.0.30",
     "apollo-cache-inmemory": "^1.6.3",
     "apollo-client": "^2.6.4",
     "apollo-link": "^1.2.11",
diff --git a/yarn.lock b/yarn.lock
index 060a9efa164..da2c8d43670 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -989,10 +989,10 @@
     "@sentry/types" "5.10.0"
     tslib "^1.9.3"
 
-"@sourcegraph/code-host-integration@0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.29.tgz#71b4392ad9bd4527f5baddc32bb90fda5c00a9c7"
-  integrity sha512-YtCZSuiBTUzlk2ku9xIHPbEIBYfwNtdZQCVaEL1AvMG0Ds0tEDBiiRdW/ZpdYjskOGwslv2wkKC2sGE/zUUrIQ==
+"@sourcegraph/code-host-integration@0.0.30":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.30.tgz#85f52eca0f8fd5efb1526a7ec6a09d261ab43bda"
+  integrity sha512-5zBN0/oa1c0lY0+MPb2kEs9NqefvOg0NevDQXqQpLHDOx+TtMzC2uEOQiBnyHm2bWcCl/RFatjvNlEV+reGgnA==
 
 "@types/anymatch@*":
   version "1.3.0"