diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-26 10:47:09 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-26 10:47:09 +0300 |
commit | a2eff1a8e55b4bf513d3d752fcd6477595813dc2 (patch) | |
tree | e7d5e3e097ef85b871c7ab5b4673e6903c294144 /app/helpers | |
parent | 13f170fc5d182da78c3d0a7a0885628f59420ea0 (diff) | |
parent | 3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff) |
Merge branch 'master' into issue-board-sidebar
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/boards_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/merge_requests_helper.rb | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index b7247ffa8b2..38c586ccd31 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -5,7 +5,7 @@ module BoardsHelper { endpoint: namespace_project_boards_path(@project.namespace, @project), board_id: board.id, - disabled: !can?(current_user, :admin_list, @project), + disabled: "#{!can?(current_user, :admin_list, @project)}", issue_link_base: namespace_project_issues_path(@project.namespace, @project) } end diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 249cb44e9d5..a6659ea2fd1 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -86,11 +86,15 @@ module MergeRequestsHelper end def source_branch_with_namespace(merge_request) - branch = link_to(merge_request.source_branch, namespace_project_commits_path(merge_request.source_project.namespace, merge_request.source_project, merge_request.source_branch)) + namespace = merge_request.source_project_namespace + branch = merge_request.source_branch + + if merge_request.source_branch_exists? + namespace = link_to(namespace, project_path(merge_request.source_project)) + branch = link_to(branch, namespace_project_commits_path(merge_request.source_project.namespace, merge_request.source_project, merge_request.source_branch)) + end if merge_request.for_fork? - namespace = link_to(merge_request.source_project_namespace, - project_path(merge_request.source_project)) namespace + ":" + branch else branch |