diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 17:40:46 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 17:40:46 -0600 |
| commit | c1c74e608625eab143f44ef6940e64cca6af0a0c (patch) | |
| tree | c5ca4a8a39946f54878a3ecde6b4adcda11d2d9b /lib/gitlab/gfm/uploads_rewriter.rb | |
| parent | cecea7529fb37893af6bf514a53e239a3be1eea6 (diff) | |
| parent | 8900b23eab6abd5a6c01278fa0da18d5bed98491 (diff) | |
| download | gitlab-ce-c1c74e608625eab143f44ef6940e64cca6af0a0c.tar.gz | |
Merge branch 'master' into fix-no-template
Diffstat (limited to 'lib/gitlab/gfm/uploads_rewriter.rb')
| -rw-r--r-- | lib/gitlab/gfm/uploads_rewriter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gfm/uploads_rewriter.rb b/lib/gitlab/gfm/uploads_rewriter.rb index 8fab5489616..1b74f735679 100644 --- a/lib/gitlab/gfm/uploads_rewriter.rb +++ b/lib/gitlab/gfm/uploads_rewriter.rb @@ -27,7 +27,7 @@ module Gitlab with_link_in_tmp_dir(file.file) do |open_tmp_file| new_uploader.store!(open_tmp_file) end - new_uploader.to_markdown + new_uploader.markdown_link end end @@ -46,7 +46,7 @@ module Gitlab private def find_file(project, secret, file) - uploader = FileUploader.new(project, secret) + uploader = FileUploader.new(project, secret: secret) uploader.retrieve_from_store!(file) uploader.file end |