Commit cbeb06eb authored by Grzegorz Bizon's avatar Grzegorz Bizon

Mix url helpers in into `RepositoryPush`

parent 6ffe8a06
...@@ -5,6 +5,8 @@ module Gitlab ...@@ -5,6 +5,8 @@ module Gitlab
attr_accessor :recipient attr_accessor :recipient
attr_reader :author_id, :ref, :action attr_reader :author_id, :ref, :action
include Gitlab::Application.routes.url_helpers
delegate :namespace, :name_with_namespace, to: :project, prefix: :project delegate :namespace, :name_with_namespace, to: :project, prefix: :project
delegate :name, to: :author, prefix: :author delegate :name, to: :author, prefix: :author
...@@ -16,7 +18,6 @@ module Gitlab ...@@ -16,7 +18,6 @@ module Gitlab
@project_id = project_id @project_id = project_id
@recipient = recipient @recipient = recipient
@opts = opts.dup @opts = opts.dup
@urls = Gitlab::Application.routes.url_helpers
@author_id = @opts.delete(:author_id) @author_id = @opts.delete(:author_id)
@ref = @opts.delete(:ref) @ref = @opts.delete(:ref)
...@@ -86,17 +87,17 @@ module Gitlab ...@@ -86,17 +87,17 @@ module Gitlab
def target_url def target_url
if @action == :push && commits if @action == :push && commits
if commits.length > 1 if commits.length > 1
@urls.namespace_project_compare_url(project_namespace, namespace_project_compare_url(project_namespace,
project, project,
from: Commit.new(compare.base, project), from: Commit.new(compare.base, project),
to: Commit.new(compare.head, project)) to: Commit.new(compare.head, project))
else else
@urls.namespace_project_commit_url(project_namespace, namespace_project_commit_url(project_namespace,
project, commits.first) project, commits.first)
end end
else else
unless @action == :delete unless @action == :delete
@urls.namespace_project_tree_url(project_namespace, namespace_project_tree_url(project_namespace,
project, ref_name) project, ref_name)
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