Skip to content

Merge CacheMarkdownField to EE

Nick Thomas requested to merge nick.thomas/gitlab-ee:18337-merge-cache-markdown-field-to-ee into master

This branch merges http://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6095 into gitlab-ee, fixing merge conflicts.

It also merges a lot of unrelated commits in, as the MR was ahead of EE's current master.

/cc @rspeicher @rymai how does this look? It was a lot cleaner than I anticipated, actually.

Merge request reports