Commit 75f9c989 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master'

For single line Git commit messages, the close quote should be on the same line as the open quote

_Originally opened at !7299 by @jzinn._

- - -

## What does this MR do?

Chomps merge commit messages so that there is not a dangling close quote.

A better solution would be not to use quotes at all, but to set off the message in a `<div>` with a background color.

## Screenshots (if relevant)

![Screen_Shot_2016-11-04_at_8.06.54_PM](/uploads/6e749c5227d88a9bfea64e70cccaf14a/Screen_Shot_2016-11-04_at_8.06.54_PM.png)

See merge request !7975
parents e3231cc2 549242c6
...@@ -220,7 +220,7 @@ class JiraService < IssueTrackerService ...@@ -220,7 +220,7 @@ class JiraService < IssueTrackerService
entity_title = data[:entity][:title] entity_title = data[:entity][:title]
project_name = data[:project][:name] 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_title = "GitLab: Mentioned on #{entity_name} - #{entity_title}"
link_props = build_remote_link_props(url: entity_url, title: link_title) link_props = build_remote_link_props(url: entity_url, title: link_title)
......
---
title: For single line git commit messages, the close quote should be on the same
line as the open quote
merge_request:
author:
...@@ -694,7 +694,7 @@ describe SystemNoteService, services: true do ...@@ -694,7 +694,7 @@ describe SystemNoteService, services: true do
describe "existing reference" do describe "existing reference" do
before 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)]) allow_any_instance_of(JIRA::Resource::Issue).to receive(:comments).and_return([OpenStruct.new(body: message)])
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment