Commit 04d1128b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'less-chatty-hipchat-intergation' into 'master'

Less chatty HipChat intergation

The HipChat integration is noisy. In our team it constantly overwhelms the channel with a lot of commits or the bodies of their messages. It's very easy to loose the actual conversation in the midst of this.

This request does two things:

* Limit the number of shown commits on every push
* Display only the first line (the subject) of each commit messages

We tried it and found it was nicer for us 😄

See merge request !159
parents d10ecacc 1cf1e7be
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
# #
class HipchatService < Service class HipchatService < Service
MAX_COMMITS = 3
validates :token, presence: true, if: :activated? validates :token, presence: true, if: :activated?
def title def title
...@@ -64,8 +66,13 @@ class HipchatService < Service ...@@ -64,8 +66,13 @@ class HipchatService < Service
message << "pushed to branch <a href=\"#{project.web_url}/commits/#{ref}\">#{ref}</a> " message << "pushed to branch <a href=\"#{project.web_url}/commits/#{ref}\">#{ref}</a> "
message << "of <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> " message << "of <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> "
message << "(<a href=\"#{project.web_url}/compare/#{before}...#{after}\">Compare changes</a>)" message << "(<a href=\"#{project.web_url}/compare/#{before}...#{after}\">Compare changes</a>)"
for commit in push[:commits] do
message << "<br /> - #{commit[:message]} (<a href=\"#{commit[:url]}\">#{commit[:id][0..5]}</a>)" push[:commits].take(MAX_COMMITS).each do |commit|
message << "<br /> - #{commit[:message].lines.first} (<a href=\"#{commit[:url]}\">#{commit[:id][0..5]}</a>)"
end
if push[:commits].count > MAX_COMMITS
message << "<br />... #{push[:commits].count - MAX_COMMITS} more commits"
end end
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