summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Zinn <julian@asperasoft.com>2016-11-04 12:36:37 -0700
committerRémy Coutable <remy@rymai.me>2016-12-13 13:36:49 +0100
commit549242c620a812b4ed0f1a3b08f3e315027b9e65 (patch)
tree80a40790890c7ae8d7b1792e3e8b317c835cf0b2
parent0139896b370a56619b29e08ba8b5d0da091443b1 (diff)
downloadgitlab-ce-549242c620a812b4ed0f1a3b08f3e315027b9e65.tar.gz
For single line git commit messages, the close quote should be on the same line as the open quotejzinn/gitlab-ce-chomp-git-status-message
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--app/models/project_services/jira_service.rb2
-rw-r--r--changelogs/unreleased/chomp-git-status-message.yml5
-rw-r--r--spec/services/system_note_service_spec.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 894315a8593..2d969d2fcb6 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -220,7 +220,7 @@ class JiraService < IssueTrackerService
entity_title = data[:entity][:title]
project_name = data[:project][:name]
- message = "[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]:\n'#{entity_title}'"
+ message = "[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]:\n'#{entity_title.chomp}'"
link_title = "GitLab: Mentioned on #{entity_name} - #{entity_title}"
link_props = build_remote_link_props(url: entity_url, title: link_title)
diff --git a/changelogs/unreleased/chomp-git-status-message.yml b/changelogs/unreleased/chomp-git-status-message.yml
new file mode 100644
index 00000000000..f70607df7a1
--- /dev/null
+++ b/changelogs/unreleased/chomp-git-status-message.yml
@@ -0,0 +1,5 @@
+---
+title: For single line git commit messages, the close quote should be on the same
+ line as the open quote
+merge_request:
+author:
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 90b7e62bc6f..0e8adb68721 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -694,7 +694,7 @@ describe SystemNoteService, services: true do
describe "existing reference" do
before do
- message = "[#{author.name}|http://localhost/#{author.username}] mentioned this issue in [a commit of #{project.path_with_namespace}|http://localhost/#{project.path_with_namespace}/commit/#{commit.id}]:\n'#{commit.title}'"
+ message = "[#{author.name}|http://localhost/#{author.username}] mentioned this issue in [a commit of #{project.path_with_namespace}|http://localhost/#{project.path_with_namespace}/commit/#{commit.id}]:\n'#{commit.title.chomp}'"
allow_any_instance_of(JIRA::Resource::Issue).to receive(:comments).and_return([OpenStruct.new(body: message)])
end