diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:00 +0000 |
| commit | eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d (patch) | |
| tree | d572a6d931152ae0dd10427237f5811893438552 /app/models/project_services | |
| parent | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (diff) | |
| download | gitlab-ce-eb1f5a3e087b7d6a3e85f2724b5a475cc9d9d37d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_services')
| -rw-r--r-- | app/models/project_services/chat_message/base_message.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/chat_notification_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |