diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-16 23:26:04 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-16 23:26:04 +0300 |
| commit | 67312fceaa69abb2bc88aa62601625e9f6a62270 (patch) | |
| tree | f67e39bab7386f870e4908dba0746914a4db7d29 /app/controllers | |
| parent | e66b811d81d399fdfeed13563db108242f9021e6 (diff) | |
| parent | b0a163208c1b428fc9f5adad6489f8a3ab884a2b (diff) | |
Merge branch 'dm-blob-viewer-concerns' into 'master'
Move some blob viewer stuff around without changing behavior
See merge request !11358
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/renders_blob.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/renders_blob.rb b/app/controllers/concerns/renders_blob.rb index 4a6630dfd90..1d37e4cb3bd 100644 --- a/app/controllers/concerns/renders_blob.rb +++ b/app/controllers/concerns/renders_blob.rb @@ -14,7 +14,7 @@ module RendersBlob return render_404 unless viewer render json: { - html: view_to_html_string("projects/blob/_viewer", viewer: viewer, load_asynchronously: false) + html: view_to_html_string("projects/blob/_viewer", viewer: viewer, load_async: false) } end |