diff options
| author | James Lopez <james@jameslopez.es> | 2016-02-17 20:05:40 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-02-17 20:05:40 +0300 |
| commit | 4b650fac76c35bd8666d7a53ad6ff02f256ad64d (patch) | |
| tree | cda2723be0e843c7cbb8c6cc3d152b341a02b60a /app/views | |
| parent | dd68d100e659d315ce6b21dac914beeda0fd1d4c (diff) | |
updated fix based on MR feedback
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/forks/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index 42fa6fdb782..3e636533bb4 100644 --- a/app/views/projects/forks/index.html.haml +++ b/app/views/projects/forks/index.html.haml @@ -30,7 +30,7 @@ = sort_title_oldest_updated - if current_user && can?(current_user, :fork_project, @project) - - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 + - if current_user && 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 btn-new' do = icon('code-fork fw') Fork diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 00bf9dcd2d5..900d7939ae9 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -4,7 +4,7 @@ - ci = false unless local_assigns[:ci] == true - skip_namespace = false unless local_assigns[:skip_namespace] == true - css_class = '' unless local_assigns[:css_class] -- show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true +- show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && !project.empty_repo? && project.commit - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description - ci_commit = project.ci_commit(project.commit.sha) if ci && !project.empty_repo? && project.commit - cache_key = [project.namespace, project, controller.controller_name, controller.action_name, current_application_settings, 'v2.2'] |