diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-19 00:16:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-19 00:16:02 +0300 |
commit | 391beda74a957bfa72144cca886ace03a2db4e92 (patch) | |
tree | ed2cc9f68983bdf62fdf88641de4e921a87f57da /app/views/projects | |
parent | b53f92660977ebc05433e9bbeb74e3c4c6bf0194 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/forks/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index 3cec7fd9eb8..c57b6dbe28c 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -1,7 +1,7 @@ - unless @project.empty_repo? - if current_user .count-badge.btn-group - - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 + - if current_user.already_forked?(@project) && current_user.forkable_namespaces.size < 2 = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: s_('ProjectOverview|Go to your fork'), class: 'gl-button btn btn-default btn-sm has-tooltip fork-btn' do = sprite_icon('fork', css_class: 'icon') %span= s_('ProjectOverview|Fork') diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index d6f421e8ad6..5330c3aa6d6 100644 --- a/app/views/projects/forks/index.html.haml +++ b/app/views/projects/forks/index.html.haml @@ -25,7 +25,7 @@ = forks_sort_direction_button(sort_value) - if current_user && can?(current_user, :fork_project, @project) - - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 + - if current_user.already_forked?(@project) && current_user.forkable_namespaces.size < 2 = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: _('Go to your fork'), class: 'btn gl-button btn-confirm gl-md-ml-3' do = sprite_icon('fork', size: 12) %span= _('Fork') |