diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-11 16:55:40 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-11 23:32:55 +0200 |
| commit | af7214d0f077f738ed57194feb0cd468c43d4310 (patch) | |
| tree | 36c2d2abd7252af8a4610f22affa92f8f2b2e1e5 /app/views | |
| parent | 5d69f5b46d475f34fb71dfb4e8b683e90897f1da (diff) | |
| download | gitlab-ce-af7214d0f077f738ed57194feb0cd468c43d4310.tar.gz | |
Fix specs
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index 41b1ca9f9e8..20160a718bc 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -196,7 +196,7 @@ .build-widget %h4.title #{pluralize(@builds.count(:id), "other build")} for = succeed ":" do - = link_to @build.commit.short_sha, builds_namespace_project_commit_path(@project.namespace, @project, build.sha), class: "monospace" + = link_to @build.commit.short_sha, builds_namespace_project_commit_path(@project.namespace, @project, @build.sha), class: "monospace" %table.table.builds - @builds.each_with_index do |build, i| %tr.build diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 53261fcace7..ab8b022411d 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -7,7 +7,7 @@ - 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 - cache_key = [project.namespace, project, controller.controller_name, controller.action_name, current_application_settings, 'v2.3'] -- cache_key.push(project.commit.status) if project.commit.status +- cache_key.push(project.commit.status) if project.commit.try(:status) %li.project-row{ class: css_class } = cache(cache_key) do @@ -15,7 +15,7 @@ - if project.main_language %span = project.main_language - - if project.commit.status + - if project.commit.try(:status) %span = render_ci_status(project.commit) - if forks |