diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-06 14:42:44 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-06 14:46:52 -0500 |
| commit | 1a714b6248d68f3043eebf30fbf284fc516a66bb (patch) | |
| tree | 83f413042c4970477404c2a01900f0c6e798988a | |
| parent | bce482a59a235edf1607dab73dff88aba4300012 (diff) | |
| download | gitlab-ce-rs-current-user-can.tar.gz | |
Remove current_user check before permission checksrs-current-user-can
| -rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/commit_statuses/_commit_status.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/empty.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index 133531887a2..a558629fa61 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -1,5 +1,5 @@ - unless @project.empty_repo? - - if current_user && can?(current_user, :fork_project, @project) + - if can?(current_user, :fork_project, @project) - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn has_tooltip' do = icon('code-fork fw') diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml index 2e3c956ddc4..d763169358f 100644 --- a/app/views/projects/commit_statuses/_commit_status.html.haml +++ b/app/views/projects/commit_statuses/_commit_status.html.haml @@ -66,10 +66,10 @@ %td .pull-right - - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts_download_url + - if can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts_download_url = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do %i.fa.fa-download - - if current_user && can?(current_user, :manage_builds, commit_status.project) + - if can?(current_user, :manage_builds, commit_status.project) - if commit_status.active? - if commit_status.cancel_url = link_to commit_status.cancel_url, method: :post, title: 'Cancel' do diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index b34d106d565..4ab83891687 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -1,7 +1,7 @@ - @no_container = true = content_for :flash_message do - - if current_user && can?(current_user, :download_code, @project) + - if can?(current_user, :download_code, @project) = render 'shared/no_ssh' = render 'shared/no_password' diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 4310f038fc9..61fd5fea1b9 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -5,7 +5,7 @@ = auto_discovery_link_tag(:atom, namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "#{@project.name} activity") = content_for :flash_message do - - if current_user && can?(current_user, :download_code, @project) + - if can?(current_user, :download_code, @project) = render 'shared/no_ssh' = render 'shared/no_password' |