diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-21 12:47:32 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-21 12:47:32 -0500 |
commit | 3b39214f29f5c2e773f2af923cec70a463f39a73 (patch) | |
tree | 5e519a86c4f0431ca3f309474746a33d70dd1c9f /app/views/shared/projects/_project.html.haml | |
parent | d4f6d39896392a964c254ad542eeefeb7c254093 (diff) | |
parent | 1c7c114e76510349bebb2494c951713813526489 (diff) | |
download | gitlab-ce-3b39214f29f5c2e773f2af923cec70a463f39a73.tar.gz |
Merge remote-tracking branch 'origin/master' into issue_14904
Diffstat (limited to 'app/views/shared/projects/_project.html.haml')
-rw-r--r-- | app/views/shared/projects/_project.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 53ff8959bc8..ab8b022411d 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -6,9 +6,8 @@ - css_class = '' unless local_assigns[:css_class] - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && 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.3'] -- cache_key.push(ci_commit.status) if ci_commit +- cache_key.push(project.commit.status) if project.commit.try(:status) %li.project-row{ class: css_class } = cache(cache_key) do @@ -16,9 +15,9 @@ - if project.main_language %span = project.main_language - - if ci_commit + - if project.commit.try(:status) %span - = render_ci_status(ci_commit) + = render_ci_status(project.commit) - if forks %span = icon('code-fork') |