summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-08-21 17:27:06 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2017-08-22 20:15:45 +0200
commitb4aaced71a65faffd49ffa2c705fb574ed532701 (patch)
tree149d1f65c9cab089046d8bf7af4bea57efa235f3 /spec/helpers
parente6f20e52f6f77f77942c047dca91d3e325cce8b2 (diff)
downloadgitlab-ce-b4aaced71a65faffd49ffa2c705fb574ed532701.tar.gz
Fix display of push events for removed refsfix-push-events-branch-removals
This changes the style of push events that remove tags or branches so they don't display the commit details. This prevents displaying commit details such as: 000000 . --broken encoding Instead we now simply display the header such as: Administrator deleted branch example-branch This is displayed in the same style as events for newly created branches/tags. This commit also ensures that if no commit message is present we simply don't display anything, instead of "--broken encoding". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/events_helper_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb
index 4b72dbb7964..d5536fcb22b 100644
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
@@ -106,5 +106,9 @@ describe EventsHelper do
it "handles empty strings" do
expect(helper.event_commit_title("")).to eq("")
end
+
+ it 'handles nil values' do
+ expect(helper.event_commit_title(nil)).to eq('')
+ end
end
end