Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
3174b080
Commit
3174b080
authored
Sep 14, 2018
by
Kukovskii Vladimir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add fix for EE merge message
parent
289aecb0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/models/project_services/chat_message/merge_message.rb
app/models/project_services/chat_message/merge_message.rb
+6
-1
changelogs/unreleased/44596-double-title-merge-request-message.yml
...s/unreleased/44596-double-title-merge-request-message.yml
+1
-1
No files found.
app/models/project_services/chat_message/merge_message.rb
View file @
3174b080
...
...
@@ -48,7 +48,7 @@ module ChatMessage
end
def
merge_request_message
"
#{
user_combined_name
}
#{
state
}
#{
merge_request_link
}
in
#{
project_link
}
"
"
#{
user_combined_name
}
#{
state
_or_action_text
}
#{
merge_request_link
}
in
#{
project_link
}
"
end
def
merge_request_link
...
...
@@ -62,5 +62,10 @@ module ChatMessage
def
merge_request_url
"
#{
project_url
}
/merge_requests/
#{
merge_request_iid
}
"
end
# overridden in EE
def
state_or_action_text
state
end
end
end
changelogs/unreleased/44596-double-title-merge-request-message.yml
View file @
3174b080
---
title
:
Fix double title in merge request chat messages.
merge_request
:
merge_request
:
21670
author
:
Kukovskii Vladimir
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment