Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

app/helpers/projects_helper.rb

@@ -272,4 +272,8 @@ module ProjectsHelper
       current_user.recent_push(@project.id)
     end
   end
+
+  def readme_cache_key
+    [@project.id, @project.commit.sha, "readme"].join('-')
+  end
 end

app/views/projects/show.html.haml

@@ -50,6 +50,7 @@
             = link_to namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light' do
               %i.fa.fa-pencil
       .wiki
+        = cache(readme_cache_key) do
           = render_readme(readme)
   - else
     %h3.page-title