summaryrefslogtreecommitdiff
path: root/app/models/project_services/campfire_service.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-10 11:51:36 +0100
committerDouwe Maan <douwe@gitlab.com>2015-03-10 13:39:31 +0100
commit383c56efa1882d9cab956de5b5b72e51691c3f0c (patch)
tree1eebe2c35351d44a9fa54f53658346f86d9566a3 /app/models/project_services/campfire_service.rb
parente0caed91e2cd6b959f808139df7c40f3644f88fd (diff)
downloadgitlab-ce-383c56efa1882d9cab956de5b5b72e51691c3f0c.tar.gz
Use Gitlab::Git helper methods and constants as much as possible.
Diffstat (limited to 'app/models/project_services/campfire_service.rb')
-rw-r--r--app/models/project_services/campfire_service.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb
index 1c63444fbf9..e591afdda64 100644
--- a/app/models/project_services/campfire_service.rb
+++ b/app/models/project_services/campfire_service.rb
@@ -64,7 +64,7 @@ class CampfireService < Service
end
def build_message(push)
- ref = push[:ref].gsub("refs/heads/", "")
+ ref = Gitlab::Git.ref_name(push[:ref])
before = push[:before]
after = push[:after]
@@ -72,9 +72,9 @@ class CampfireService < Service
message << "[#{project.name_with_namespace}] "
message << "#{push[:user_name]} "
- if before.include?('000000')
+ if Gitlab::Git.blank_ref?(before)
message << "pushed new branch #{ref} \n"
- elsif after.include?('000000')
+ elsif Gitlab::Git.blank_ref?(after)
message << "removed branch #{ref} \n"
else
message << "pushed #{push[:total_commits_count]} commits to #{ref}. "