diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-21 13:59:34 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-27 12:23:26 -0500 |
| commit | 0e0c760e487651cdbddfce818ca6b69ad43fe071 (patch) | |
| tree | 86351159d35ccb0cc63e4cb565961db8a56309cb /app/views | |
| parent | a7fd95cd22062f18474ee038d72fa9e1139a1a84 (diff) | |
| download | gitlab-ce-0e0c760e487651cdbddfce818ca6b69ad43fe071.tar.gz | |
Refactor overriding max size
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/blob/_header.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/_viewer.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml index 19eca2984db..b89cd460455 100644 --- a/app/views/projects/blob/_header.html.haml +++ b/app/views/projects/blob/_header.html.haml @@ -15,7 +15,7 @@ = render 'projects/blob/viewer_switcher', blob: blob unless blame .btn-group{ role: "group" }< - = copy_blob_source_button(blob) if !blame && blob.rendered_as_text?(override_max_size: params[:override_max_size]) + = copy_blob_source_button(blob) if !blame && blob.rendered_as_text?(ignore_errors: false) = open_raw_file_button(namespace_project_raw_path(@project.namespace, @project, @id)) = view_on_environment_button(@commit.sha, @path, @environment) if @environment diff --git a/app/views/projects/blob/_viewer.html.haml b/app/views/projects/blob/_viewer.html.haml index e0cfe39d1ec..1c45c4a68ce 100644 --- a/app/views/projects/blob/_viewer.html.haml +++ b/app/views/projects/blob/_viewer.html.haml @@ -1,5 +1,5 @@ - hidden = local_assigns.fetch(:hidden, false) -- render_error = viewer.render_error(override_max_size: params[:override_max_size]) +- render_error = viewer.render_error - load_asynchronously = local_assigns.fetch(:load_asynchronously, viewer.server_side?) && render_error.nil? - url = url_for(params.merge(viewer: viewer.type, format: :json)) if load_asynchronously |