diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-01-04 02:34:13 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-04 02:34:13 +0300 |
| commit | fb4b0e6ca160ebc866deb95ae9e830993578ebe1 (patch) | |
| tree | a5b07614d24b925a2c5dd19c57ae9fbff9fd11a1 /app/helpers | |
| parent | 5a9808651b728628257545554743cdb2abba4cc3 (diff) | |
| parent | 066a99b6e9d0849b477858c9aac274c2f81bb367 (diff) | |
Merge branch '27861-add-markdown-editing-buttons-to-the-file-editor' into 'master'
Resolve "Add markdown editing buttons to the file editor"
Closes #27861
See merge request gitlab-org/gitlab-ce!23480
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/blob_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 3dea0975beb..23d6684a8e6 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -177,7 +177,8 @@ module BlobHelper 'relative-url-root' => Rails.application.config.relative_url_root, 'assets-prefix' => Gitlab::Application.config.assets.prefix, 'blob-filename' => @blob && @blob.path, - 'project-id' => project.id + 'project-id' => project.id, + 'is-markdown' => @blob && @blob.path && Gitlab::MarkupHelper.gitlab_markdown?(@blob.path) } end |