diff options
| -rw-r--r-- | app/views/layouts/_init_auto_complete.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/snippets.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/branches/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/find_file/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/graphs/show.html.haml | 2 |
6 files changed, 6 insertions, 3 deletions
diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml index 4bb0dfc73fd..9704c9ec624 100644 --- a/app/views/layouts/_init_auto_complete.html.haml +++ b/app/views/layouts/_init_auto_complete.html.haml @@ -2,6 +2,7 @@ - noteable_type = @noteable.class if @noteable.present? - if project + -# haml-lint:disable InlineJavaScript :javascript gl.GfmAutoComplete = gl.GfmAutoComplete || {}; gl.GfmAutoComplete.dataSources = { diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 99adb83cd1f..54d56e9b873 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -10,6 +10,7 @@ - content_for :project_javascripts do - project = @target_project || @project - if current_user + -# haml-lint:disable InlineJavaScript :javascript window.uploads_path = "#{project_uploads_path(project)}"; diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml index 57971205e0e..849075a0ba5 100644 --- a/app/views/layouts/snippets.html.haml +++ b/app/views/layouts/snippets.html.haml @@ -2,6 +2,7 @@ - content_for :page_specific_javascripts do - if @snippet && current_user + -# haml-lint:disable InlineJavaScript :javascript window.uploads_path = "#{upload_path('personal_snippet', id: @snippet.id)}"; diff --git a/app/views/projects/branches/new.html.haml b/app/views/projects/branches/new.html.haml index 16d7727d2b7..9d77ca4db7b 100644 --- a/app/views/projects/branches/new.html.haml +++ b/app/views/projects/branches/new.html.haml @@ -28,7 +28,7 @@ .form-actions = button_tag 'Create branch', class: 'btn btn-create', tabindex: 3 = link_to 'Cancel', project_branches_path(@project), class: 'btn btn-cancel' --# haml-lint:disable InlineJavaScript +-# haml-lint:disable InlineJavaScript :javascript window.gl = window.gl || { }; window.gl.availableRefs = #{@project.repository.ref_names.to_json}; diff --git a/app/views/projects/find_file/show.html.haml b/app/views/projects/find_file/show.html.haml index ccfcf19d3b6..de9d49cfb6a 100644 --- a/app/views/projects/find_file/show.html.haml +++ b/app/views/projects/find_file/show.html.haml @@ -1,7 +1,7 @@ - page_title "Find File", @ref = render "projects/commits/head" -.file-finder-holder.tree-holder.clearfix.js-file-finder{'data-file_find_url': "#{escape_javascript(project_files_path(@project, @ref, @options.merge(format: :json)))}", 'data-find_tree_url': escape_javascript(project_tree_path(@project, @ref)), 'data-blob_url_template': escape_javascript(project_blob_path(@project, @id || @commit.id))} +.file-finder-holder.tree-holder.clearfix.js-file-finder{'data-file_find_url': "#{ escape_javascript(project_files_path(@project, @ref, @options.merge(format: :json))) }", 'data-find_tree_url': escape_javascript(project_tree_path(@project, @ref)), 'data-blob_url_template': escape_javascript(project_blob_path(@project, @id || @commit.id))} .nav-block .tree-ref-holder = render 'shared/ref_switcher', destination: 'find_file', path: @path diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml index 63adc03a3df..296bf7048e3 100644 --- a/app/views/projects/graphs/show.html.haml +++ b/app/views/projects/graphs/show.html.haml @@ -10,7 +10,7 @@ = render 'projects/commits/head' -%div.js-graphs-show{ class: container_class, 'data-project_graph_path': "#{project_graph_path(@project, current_ref, format: :json)}" } +.js-graphs-show{ class: container_class, 'data-project_graph_path': "#{ project_graph_path(@project, current_ref, format: :json) }" } .sub-header-block .tree-ref-holder = render 'shared/ref_switcher', destination: 'graphs' |