Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 3 deletions

diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb
index 939d8bc4bef..e3df61dadae 100644
--- a/app/models/diff_note.rb
+++ b/app/models/diff_note.rb
@@ -161,7 +161,7 @@ class DiffNote < Note
   def positions_complete
     return if self.original_position.complete? && self.position.complete?
 
-    errors.add(:position, "is invalid")
+    errors.add(:position, "is incomplete")
   end
 
   def keep_around_commits
diff --git a/app/models/project_services/chat_message/base_message.rb b/app/models/project_services/chat_message/base_message.rb
index 529af1277b0..5c39a80b32d 100644
--- a/app/models/project_services/chat_message/base_message.rb
+++ b/app/models/project_services/chat_message/base_message.rb
@@ -16,7 +16,7 @@ module ChatMessage
 
     def initialize(params)
       @markdown = params[:markdown] || false
-      @project_name = params.dig(:project, :path_with_namespace) || params[:project_name]
+      @project_name = params[:project_name] || params.dig(:project, :path_with_namespace)
       @project_url = params.dig(:project, :web_url) || params[:project_url]
       @user_full_name = params.dig(:user, :name) || params[:user_full_name]
       @user_name = params.dig(:user, :username) || params[:user_name]
diff --git a/app/models/project_services/chat_notification_service.rb b/app/models/project_services/chat_notification_service.rb
index b84a79453c1..46c8260ab48 100644
--- a/app/models/project_services/chat_notification_service.rb
+++ b/app/models/project_services/chat_notification_service.rb
@@ -157,7 +157,7 @@ class ChatNotificationService < Service
   end
 
   def project_name
-    project.full_name.gsub(/\s/, '')
+    project.full_name
   end
 
   def project_url