summaryrefslogtreecommitdiff
path: root/app/models/project_services/flowdock_service.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-11 09:32:41 +0100
committerPhil Hughes <me@iamphill.com>2017-05-11 09:32:41 +0100
commit1ed0673c254003fc9e3f861fce8671712d71a2de (patch)
tree20b9d1c4baec3c593fe2c9b06c0d809c224562c0 /app/models/project_services/flowdock_service.rb
parent584ea586ff04bd57852748f4e6b046200eac7f68 (diff)
parent4067dd4f84681dd109fb8e1957b6327b4db20193 (diff)
downloadgitlab-ce-1ed0673c254003fc9e3f861fce8671712d71a2de.tar.gz
Merge branch 'master' into refactor-realtime-issue
Diffstat (limited to 'app/models/project_services/flowdock_service.rb')
-rw-r--r--app/models/project_services/flowdock_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb
index 10a13c3fbdc..2a05d757eb4 100644
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
@@ -37,7 +37,7 @@ class FlowdockService < Service
repo: project.repository.path_to_repo,
repo_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}",
commit_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/%s",
- diff_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/compare/%s...%s",
+ diff_url: "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/compare/%s...%s"
)
end
end