Commit dd5ffd9c authored by Kushal Pandya's avatar Kushal Pandya

HAMLLint: Fix `ImplicitDiv` offences

parent 7157f585
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
= form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put do = form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put do
%div %div
= users_select_tag(:user_ids, multiple: true, email_user: true, scope: :all) = users_select_tag(:user_ids, multiple: true, email_user: true, scope: :all)
%div.prepend-top-10 .prepend-top-10
= select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2" = select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
%hr %hr
= button_tag 'Add users to group', class: "btn btn-create" = button_tag 'Add users to group', class: "btn btn-create"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
System hook will be triggered on set of events like creating project System hook will be triggered on set of events like creating project
or adding ssh key. But you can also enable extra triggers like Push events. or adding ssh key. But you can also enable extra triggers like Push events.
%div.prepend-top-default .prepend-top-default
= f.check_box :push_events, class: 'pull-left' = f.check_box :push_events, class: 'pull-left'
.prepend-left-20 .prepend-left-20
= f.label :push_events, class: 'list-label' do = f.label :push_events, class: 'list-label' do
...@@ -70,4 +70,3 @@ ...@@ -70,4 +70,3 @@
- if hook.send(trigger) - if hook.send(trigger)
%span.label.label-gray= trigger.titleize %span.label.label-gray= trigger.titleize
%span.label.label-gray SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"} %span.label.label-gray SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"}
= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'new_user gl-show-field-errors', 'aria-live' => 'assertive'}) do |f| = form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: 'new_user gl-show-field-errors', 'aria-live' => 'assertive'}) do |f|
%div.form-group .form-group
= f.label "Username or email", for: :login = f.label "Username or email", for: :login
= f.text_field :login, class: "form-control top", autofocus: "autofocus", autocapitalize: "off", autocorrect: "off", required: true, title: "This field is required." = f.text_field :login, class: "form-control top", autofocus: "autofocus", autocapitalize: "off", autocorrect: "off", required: true, title: "This field is required."
%div.form-group .form-group
= f.label :password = f.label :password
= f.password_field :password, class: "form-control bottom", required: true, title: "This field is required." = f.password_field :password, class: "form-control bottom", required: true, title: "This field is required."
- if devise_mapping.rememberable? - if devise_mapping.rememberable?
...@@ -12,5 +12,5 @@ ...@@ -12,5 +12,5 @@
%span Remember me %span Remember me
.pull-right.forgot-password .pull-right.forgot-password
= link_to "Forgot your password?", new_password_path(resource_name) = link_to "Forgot your password?", new_password_path(resource_name)
%div.submit-container.move-submit-down .submit-container.move-submit-down
= f.submit "Sign in", class: "btn btn-save" = f.submit "Sign in", class: "btn btn-save"
%div.omniauth-container .omniauth-container
%p %p
%span.light %span.light
Sign in with   Sign in with  
......
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
= form_for(resource, as: "new_#{resource_name}", url: registration_path(resource_name), html: { class: "new_new_user gl-show-field-errors", "aria-live" => "assertive" }) do |f| = form_for(resource, as: "new_#{resource_name}", url: registration_path(resource_name), html: { class: "new_new_user gl-show-field-errors", "aria-live" => "assertive" }) do |f|
.devise-errors .devise-errors
= devise_error_messages! = devise_error_messages!
%div.form-group .form-group
= f.label :name = f.label :name
= f.text_field :name, class: "form-control top", required: true, title: "This field is required." = f.text_field :name, class: "form-control top", required: true, title: "This field is required."
%div.username.form-group .username.form-group
= f.label :username = f.label :username
= f.text_field :username, class: "form-control middle", pattern: Gitlab::Regex::NAMESPACE_REGEX_STR_SIMPLE, required: true, title: 'Please create a username with only alphanumeric characters.' = f.text_field :username, class: "form-control middle", pattern: Gitlab::Regex::NAMESPACE_REGEX_STR_SIMPLE, required: true, title: 'Please create a username with only alphanumeric characters.'
%p.validation-error.hide Username is already taken. %p.validation-error.hide Username is already taken.
%p.validation-success.hide Username is available. %p.validation-success.hide Username is available.
%p.validation-pending.hide Checking username availability... %p.validation-pending.hide Checking username availability...
%div.form-group .form-group
= f.label :email = f.label :email
= f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address." = f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address."
.form-group.append-bottom-20#password-strength .form-group.append-bottom-20#password-strength
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
%tr %tr
%td %td
Anonymous Anonymous
%div.help-block .help-block
%em Authorization was granted by entering your username and password in the application. %em Authorization was granted by entering your username and password in the application.
%td= token.created_at %td= token.created_at
%td= token.scopes %td= token.scopes
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= render 'shared/members/access_request_buttons', source: @group = render 'shared/members/access_request_buttons', source: @group
= render 'shared/notifications/button', notification_setting: @notification_setting = render 'shared/notifications/button', notification_setting: @notification_setting
%div.groups-header{ class: container_class } .groups-header{ class: container_class }
.top-area .top-area
%ul.nav-links %ul.nav-links
%li.active %li.active
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-# remote: data-remote -# remote: data-remote
-# paginator: the paginator that renders the pagination tags inside -# paginator: the paginator that renders the pagination tags inside
= paginator.render do = paginator.render do
%div.gl-pagination .gl-pagination
%ul.pagination.clearfix %ul.pagination.clearfix
- unless current_page.first? - unless current_page.first?
= first_page_tag unless total_pages < 5 # As kaminari will always show the first 5 pages = first_page_tag unless total_pages < 5 # As kaminari will always show the first 5 pages
...@@ -19,4 +19,3 @@ ...@@ -19,4 +19,3 @@
= next_page_tag = next_page_tag
- unless current_page.last? - unless current_page.last?
= last_page_tag unless total_pages < 5 = last_page_tag unless total_pages < 5
%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class } %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
%a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
%div.container-fluid .container-fluid
.header-content .header-content
%button.side-nav-toggle{ type: 'button', "aria-label" => "Toggle global navigation" } %button.side-nav-toggle{ type: 'button', "aria-label" => "Toggle global navigation" }
%span.sr-only Toggle navigation %span.sr-only Toggle navigation
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
= stylesheet_link_tag 'notify' = stylesheet_link_tag 'notify'
= yield :head = yield :head
%body %body
%div.content .content
= yield = yield
%div.footer{style: "margin-top: 10px;"} .footer{style: "margin-top: 10px;"}
%p %p
&mdash; &mdash;
%br %br
......
...@@ -17,5 +17,5 @@ ...@@ -17,5 +17,5 @@
%hr %hr
%h5 %h5
Your SSH keys (#{@keys.count}) Your SSH keys (#{@keys.count})
%div.append-bottom-default .append-bottom-default
= render 'key_table' = render 'key_table'
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%div %div
- if @user.errors.any? - if @user.errors.any?
%div.alert.alert-danger .alert.alert-danger
%ul %ul
- @user.errors.full_messages.each do |msg| - @user.errors.full_messages.each do |msg|
%li= msg %li= msg
......
%div#bitbucket_import_modal.modal #bitbucket_import_modal.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
.row-content-block.project-home-empty .row-content-block.project-home-empty
%div.text-center{ class: container_class } .text-center{ class: container_class }
%h4 %h4
Customize your workflow! Customize your workflow!
%p %p
......
%div#gitlab_import_modal.modal #gitlab_import_modal.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.md.md-preview-holder.js-md-preview.hide{class: (preview_class if defined?(preview_class))} .md.md-preview-holder.js-md-preview.hide{class: (preview_class if defined?(preview_class))}
- if defined?(referenced_users) && referenced_users - if defined?(referenced_users) && referenced_users
%div.referenced-users.hide .referenced-users.hide
%span %span
= icon("exclamation-triangle") = icon("exclamation-triangle")
You are about to add You are about to add
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
- else - else
- can_create_wiki = can?(current_user, :create_wiki, @project) - can_create_wiki = can?(current_user, :create_wiki, @project)
.project-home-empty{ class: [('row-content-block' if can_create_wiki), ('content-block' unless can_create_wiki)] } .project-home-empty{ class: [('row-content-block' if can_create_wiki), ('content-block' unless can_create_wiki)] }
%div.text-center{ class: container_class } .text-center{ class: container_class }
%h4 %h4
This project does not have a wiki homepage yet This project does not have a wiki homepage yet
- if can_create_wiki - if can_create_wiki
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Download artifacts archive Download artifacts archive
.tree-holder .tree-holder
%div.tree-content-holder .tree-content-holder
%table.table.tree-table %table.table.tree-table
%thead %thead
%tr %tr
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
- blob_commit = @repository.last_commit_for_path(@commit.id, blob.path) - blob_commit = @repository.last_commit_for_path(@commit.id, blob.path)
= render blob_commit, project: @project, ref: @ref = render blob_commit, project: @project, ref: @ref
%div#blob-content-holder.blob-content-holder #blob-content-holder.blob-content-holder
%article.file-holder %article.file-holder
.file-title .file-title
= blob_icon blob.mode, blob.name = blob_icon blob.mode, blob.name
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%div{ class: container_class } %div{ class: container_class }
= render 'projects/last_push' = render 'projects/last_push'
%div#tree-holder.tree-holder #tree-holder.tree-holder
= render 'blob', blob: @blob = render 'blob', blob: @blob
- if can_edit_blob?(@blob) - if can_edit_blob?(@blob)
......
...@@ -19,5 +19,5 @@ ...@@ -19,5 +19,5 @@
= link_to ci_lint_path, class: 'btn btn-default' do = link_to ci_lint_path, class: 'btn btn-default' do
%span CI Lint %span CI Lint
%div.content-list.builds-content-list .content-list.builds-content-list
= render "table", builds: @builds, project: @project = render "table", builds: @builds, project: @project
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= link_to new_namespace_project_fork_path(@project.namespace, @project), title: 'Fork project', class: 'btn' do = link_to new_namespace_project_fork_path(@project.namespace, @project), title: 'Fork project', class: 'btn' do
= custom_icon('icon_fork') = custom_icon('icon_fork')
%span Fork %span Fork
%div.count-with-arrow .count-with-arrow
%span.arrow %span.arrow
= link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks', class: 'count' do = link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks', class: 'count' do
= @project.forks_count = @project.forks_count
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- else - else
= icon('star-o') = icon('star-o')
%span Star %span Star
%div.count-with-arrow .count-with-arrow
%span.arrow %span.arrow
%span.count.star-count %span.count.star-count
= @project.star_count = @project.star_count
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
= link_to new_user_session_path, class: 'btn has-tooltip star-btn', title: 'You must sign in to star a project' do = link_to new_user_session_path, class: 'btn has-tooltip star-btn', title: 'You must sign in to star a project' do
= icon('star') = icon('star')
Star Star
%div.count-with-arrow .count-with-arrow
%span.arrow %span.arrow
%span.count %span.count
= @project.star_count = @project.star_count
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
- if @commit.status - if @commit.status
= render "ci_menu" = render "ci_menu"
- else - else
%div.block-connector .block-connector
= render "projects/diffs/diffs", diffs: @diffs = render "projects/diffs/diffs", diffs: @diffs
= render "projects/notes/notes_with_form" = render "projects/notes/notes_with_form"
- if can_collaborate_with_project? - if can_collaborate_with_project?
......
- commits, hidden = limited_commits(@commits) - commits, hidden = limited_commits(@commits)
- commits = Commit.decorate(commits, @project) - commits = Commit.decorate(commits, @project)
%div.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
Commits (#{@commits.count}) Commits (#{@commits.count})
- if hidden > 0 - if hidden > 0
......
%div.branch-commit .branch-commit
- if deployment.ref - if deployment.ref
.icon-container .icon-container
= deployment.tag? ? icon('tag') : icon('code-fork') = deployment.tag? ? icon('tag') : icon('code-fork')
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
%p.image-info= "#{number_to_human_size file.size}" %p.image-info= "#{number_to_human_size file.size}"
- else - else
.image .image
%div.two-up.view .two-up.view
%span.wrap %span.wrap
.frame.deleted .frame.deleted
%a{href: namespace_project_blob_path(@project.namespace, @project, tree_join(diff_file.old_ref, diff.old_path))} %a{href: namespace_project_blob_path(@project.namespace, @project, tree_join(diff_file.old_ref, diff.old_path))}
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
%b H: %b H:
%span.meta-height %span.meta-height
%div.swipe.view.hide .swipe.view.hide
.swipe-frame .swipe-frame
.frame.deleted .frame.deleted
%img{src: old_file_raw_path, alt: diff.old_path} %img{src: old_file_raw_path, alt: diff.old_path}
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
%span.top-handle %span.top-handle
%span.bottom-handle %span.bottom-handle
%div.onion-skin.view.hide .onion-skin.view.hide
.onion-skin-frame .onion-skin-frame
.frame.deleted .frame.deleted
%img{src: old_file_raw_path, alt: diff.old_path} %img{src: old_file_raw_path, alt: diff.old_path}
......
/ Side-by-side diff view / Side-by-side diff view
%div.text-file.diff-wrap-lines.code.js-syntax-highlight{ data: diff_view_data } .text-file.diff-wrap-lines.code.js-syntax-highlight{ data: diff_view_data }
%table %table
- last_line = 0 - last_line = 0
- diff_file.parallel_diff_lines.each do |line| - diff_file.parallel_diff_lines.each do |line|
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
.empty_wrapper .empty_wrapper
%h3.page-title-empty %h3.page-title-empty
Command line instructions Command line instructions
%div.git-empty .git-empty
%fieldset %fieldset
%h5 Git global setup %h5 Git global setup
%pre.light-well %pre.light-well
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%li.file-finder %li.file-finder
%input#file_find.form-control.file-finder-input{type: "text", placeholder: 'Find by path', autocomplete: 'off'} %input#file_find.form-control.file-finder-input{type: "text", placeholder: 'Find by path', autocomplete: 'off'}
%div.tree-content-holder .tree-content-holder
.table-holder .table-holder
%table.table.files-slider{class: "table_#{@hex_path} tree-table table-striped" } %table.table.files-slider{class: "table_#{@hex_path} tree-table table-striped" }
%tbody %tbody
......
%div#modal_merge_info.modal #modal_merge_info.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
- if @merge_request_diffs.size > 1 - if @merge_request_diffs.size > 1
.mr-version-controls .mr-version-controls
%div.mr-version-menus-container.content-block .mr-version-menus-container.content-block
Changes between Changes between
%span.dropdown.inline.mr-version-dropdown %span.dropdown.inline.mr-version-dropdown
%a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} } %a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} }
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
- if git_import_enabled? - if git_import_enabled?
= link_to "#", class: 'btn js-toggle-button import_git' do = link_to "#", class: 'btn js-toggle-button import_git' do
= icon('git', text: 'Repo by URL') = icon('git', text: 'Repo by URL')
%div.import_gitlab_project .import_gitlab_project
- if gitlab_project_import_enabled? - if gitlab_project_import_enabled?
= link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
= icon('gitlab', text: 'GitLab export') = icon('gitlab', text: 'GitLab export')
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
= link_to ci_lint_path, class: 'btn btn-default' do = link_to ci_lint_path, class: 'btn btn-default' do
%span CI Lint %span CI Lint
%div.content-list.pipelines .content-list.pipelines
- if @pipelines.blank? - if @pipelines.blank?
%div %div
.nothing-here-block No pipelines to show .nothing-here-block No pipelines to show
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- page_title "Pipeline" - page_title "Pipeline"
= render "projects/pipelines/head" = render "projects/pipelines/head"
%div.js-pipeline-container{ class: container_class, data: { controller_action: "#{controller.action_name}" } } .js-pipeline-container{ class: container_class, data: { controller_action: "#{controller.action_name}" } }
- if @commit - if @commit
= render "projects/pipelines/info" = render "projects/pipelines/info"
......
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
.row-content-block.top-block.content-component-block .row-content-block.top-block.content-component-block
= render 'award_emoji/awards_block', awardable: @snippet, inline: true = render 'award_emoji/awards_block', awardable: @snippet, inline: true
%div#notes= render "projects/notes/notes_with_form" #notes= render "projects/notes/notes_with_form"
%div.tree-content-holder .tree-content-holder
.table-holder .table-holder
%table.table#tree-slider{class: "table_#{@hex_path} tree-table" } %table.table#tree-slider{class: "table_#{@hex_path} tree-table" }
%thead %thead
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%th.hidden-xs %th.hidden-xs
.pull-left Last commit .pull-left Last commit
.last-commit.hidden-sm.pull-left .last-commit.hidden-sm.pull-left
%small.light %small.light
= clipboard_button(clipboard_text: @commit.id) = clipboard_button(clipboard_text: @commit.id)
= link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" = link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
= time_ago_with_tooltip(@commit.committed_date) = time_ago_with_tooltip(@commit.committed_date)
......
- @no_container = true - @no_container = true
%div{ class: container_class } %div{ class: container_class }
%div#modal-new-wiki.modal #modal-new-wiki.modal
.modal-dialog .modal-dialog
.modal-content .modal-content
.modal-header .modal-header
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.participants-author.js-participants-author .participants-author.js-participants-author
= link_to_member(@project, participant, name: false, size: 24) = link_to_member(@project, participant, name: false, size: 24)
- if participants_extra > 0 - if participants_extra > 0
%div.participants-more .participants-more
%a.js-participants-more{href: "#", data: {original_text: "+ #{participants_size - 7} more", less_text: "- show less"}} %a.js-participants-more{href: "#", data: {original_text: "+ #{participants_size - 7} more", less_text: "- show less"}}
+ #{participants_extra} more + #{participants_extra} more
:javascript :javascript
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
- if issuable.is_a?(Issue) - if issuable.is_a?(Issue)
= confidential_icon(issuable) = confidential_icon(issuable)
= link_to_gfm issuable.title, [project.namespace.becomes(Namespace), project, issuable], title: issuable.title = link_to_gfm issuable.title, [project.namespace.becomes(Namespace), project, issuable], title: issuable.title
%div.issuable-detail .issuable-detail
= link_to [project.namespace.becomes(Namespace), project, issuable] do = link_to [project.namespace.becomes(Namespace), project, issuable] do
%span.issuable-number >= issuable.to_reference %span.issuable-number >= issuable.to_reference
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
%a.btn.btn-warning#js-u2f-try-again Try again? %a.btn.btn-warning#js-u2f-try-again Try again?
%script#js-register-u2f-registered{ type: "text/template" } %script#js-register-u2f-registered{ type: "text/template" }
%div.row.append-bottom-10 .row.append-bottom-10
.col-md-12 .col-md-12
%p Your device was successfully set up! Give it a name and register it with the GitLab server. %p Your device was successfully set up! Give it a name and register it with the GitLab server.
= form_tag(create_u2f_profile_two_factor_auth_path, method: :post) do = form_tag(create_u2f_profile_two_factor_auth_path, method: :post) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment