diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-12 16:12:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-12 16:12:05 +0000 |
| commit | 7a5fbb493810c23a4bfb34909bfe311c6b265873 (patch) | |
| tree | cb599533c8a4438604f2a7c0bbfb183956beb6c3 | |
| parent | 66824e09e23648923fea061e956c4c7a16730c75 (diff) | |
| parent | 827fbc10f6147c3c86278ed7f1675b085cc2a3cb (diff) | |
| download | gitlab-ce-7a5fbb493810c23a4bfb34909bfe311c6b265873.tar.gz | |
Merge branch '14272-forks-listed-when-permission-is-missing' into 'master'
Only show forks for users who can download code
The ForksController enforces this, so don't show the link if it won't go anywhere.
Closes #14272.
See merge request !4017
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1d8712ae925..260a63d0608 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -32,6 +32,7 @@ v 8.8.0 (unreleased) - Backport GitHub Enterprise import support from EE - Create tags using Rugged for performance reasons. !3745 - API: Expose Issue#user_notes_count. !3126 (Anton Popov) + - Don't show forks button when user can't view forks - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718 - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes) - Add eager load paths to help prevent dependency load issues in Sidekiq workers. !3724 diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 85f8854d2eb..e1ab78df69e 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -138,10 +138,10 @@ module ProjectsHelper private def get_project_nav_tabs(project, current_user) - nav_tabs = [:home, :forks] + nav_tabs = [:home] if !project.empty_repo? && can?(current_user, :download_code, project) - nav_tabs << [:files, :commits, :network, :graphs] + nav_tabs << [:files, :commits, :network, :graphs, :forks] end if project.repo_exists? && can?(current_user, :read_merge_request, project) |