diff options
author | Valery Sizov <vsv2711@gmail.com> | 2015-07-29 12:19:37 +0300 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2015-07-29 12:19:37 +0300 |
commit | 81c71d2519cef11bd94ad570d1d4e0e6ca4d71f1 (patch) | |
tree | f33c25d2972cbbc7a0f14efba9eb64d7e0e9f2c5 /app/helpers/projects_helper.rb | |
parent | 5efb58b09a9c0c794a66ae0b46df4c7d58064b60 (diff) | |
parent | e6feb987737ba2954ccf70de6607e6ff84029d3a (diff) | |
download | gitlab-ce-81c71d2519cef11bd94ad570d1d4e0e6ca4d71f1.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r-- | app/helpers/projects_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 3cd52b381bd..a675a292432 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -278,7 +278,8 @@ module ProjectsHelper end def readme_cache_key - [@project.id, @project.commit.sha, "readme"].join('-') + sha = @project.commit.try(:sha) || 'nil' + [@project.id, sha, "readme"].join('-') end def round_commit_count(project) |