HAMLLint: Fix ImplicitDiv offences
This commit is contained in:
Kushal Pandya
parent
7157f5857a
commit
dd5ffd9ca6
41 changed files with 50 additions and 52 deletions
|
|
@ -103,7 +103,7 @@
|
|||
= form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put do
|
||||
%div
|
||||
= 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"
|
||||
%hr
|
||||
= button_tag 'Add users to group', class: "btn btn-create"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
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.
|
||||
|
||||
%div.prepend-top-default
|
||||
.prepend-top-default
|
||||
= f.check_box :push_events, class: 'pull-left'
|
||||
.prepend-left-20
|
||||
= f.label :push_events, class: 'list-label' do
|
||||
|
|
@ -70,4 +70,3 @@
|
|||
- if hook.send(trigger)
|
||||
%span.label.label-gray= trigger.titleize
|
||||
%span.label.label-gray SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
= 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.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.password_field :password, class: "form-control bottom", required: true, title: "This field is required."
|
||||
- if devise_mapping.rememberable?
|
||||
|
|
@ -12,5 +12,5 @@
|
|||
%span Remember me
|
||||
.pull-right.forgot-password
|
||||
= 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"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%div.omniauth-container
|
||||
.omniauth-container
|
||||
%p
|
||||
%span.light
|
||||
Sign in with
|
||||
|
|
|
|||
|
|
@ -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|
|
||||
.devise-errors
|
||||
= devise_error_messages!
|
||||
%div.form-group
|
||||
.form-group
|
||||
= f.label :name
|
||||
= 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.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-success.hide Username is available.
|
||||
%p.validation-pending.hide Checking username availability...
|
||||
%div.form-group
|
||||
.form-group
|
||||
= f.label :email
|
||||
= f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address."
|
||||
.form-group.append-bottom-20#password-strength
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
%tr
|
||||
%td
|
||||
Anonymous
|
||||
%div.help-block
|
||||
.help-block
|
||||
%em Authorization was granted by entering your username and password in the application.
|
||||
%td= token.created_at
|
||||
%td= token.scopes
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
= render 'shared/members/access_request_buttons', source: @group
|
||||
= render 'shared/notifications/button', notification_setting: @notification_setting
|
||||
|
||||
%div.groups-header{ class: container_class }
|
||||
.groups-header{ class: container_class }
|
||||
.top-area
|
||||
%ul.nav-links
|
||||
%li.active
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
-# remote: data-remote
|
||||
-# paginator: the paginator that renders the pagination tags inside
|
||||
= paginator.render do
|
||||
%div.gl-pagination
|
||||
.gl-pagination
|
||||
%ul.pagination.clearfix
|
||||
- unless current_page.first?
|
||||
= first_page_tag unless total_pages < 5 # As kaminari will always show the first 5 pages
|
||||
|
|
@ -19,4 +19,3 @@
|
|||
= next_page_tag
|
||||
- unless current_page.last?
|
||||
= last_page_tag unless total_pages < 5
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
%header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
|
||||
%a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
|
||||
%div.container-fluid
|
||||
.container-fluid
|
||||
.header-content
|
||||
%button.side-nav-toggle{ type: 'button', "aria-label" => "Toggle global navigation" }
|
||||
%span.sr-only Toggle navigation
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
= stylesheet_link_tag 'notify'
|
||||
= yield :head
|
||||
%body
|
||||
%div.content
|
||||
.content
|
||||
= yield
|
||||
%div.footer{style: "margin-top: 10px;"}
|
||||
.footer{style: "margin-top: 10px;"}
|
||||
%p
|
||||
—
|
||||
%br
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@
|
|||
%hr
|
||||
%h5
|
||||
Your SSH keys (#{@keys.count})
|
||||
%div.append-bottom-default
|
||||
.append-bottom-default
|
||||
= render 'key_table'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
%div
|
||||
- if @user.errors.any?
|
||||
%div.alert.alert-danger
|
||||
.alert.alert-danger
|
||||
%ul
|
||||
- @user.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%div#bitbucket_import_modal.modal
|
||||
#bitbucket_import_modal.modal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.row-content-block.project-home-empty
|
||||
%div.text-center{ class: container_class }
|
||||
.text-center{ class: container_class }
|
||||
%h4
|
||||
Customize your workflow!
|
||||
%p
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%div#gitlab_import_modal.modal
|
||||
#gitlab_import_modal.modal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
.md.md-preview-holder.js-md-preview.hide{class: (preview_class if defined?(preview_class))}
|
||||
|
||||
- if defined?(referenced_users) && referenced_users
|
||||
%div.referenced-users.hide
|
||||
.referenced-users.hide
|
||||
%span
|
||||
= icon("exclamation-triangle")
|
||||
You are about to add
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
- else
|
||||
- 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)] }
|
||||
%div.text-center{ class: container_class }
|
||||
.text-center{ class: container_class }
|
||||
%h4
|
||||
This project does not have a wiki homepage yet
|
||||
- if can_create_wiki
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
Download artifacts archive
|
||||
|
||||
.tree-holder
|
||||
%div.tree-content-holder
|
||||
.tree-content-holder
|
||||
%table.table.tree-table
|
||||
%thead
|
||||
%tr
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
- blob_commit = @repository.last_commit_for_path(@commit.id, blob.path)
|
||||
= render blob_commit, project: @project, ref: @ref
|
||||
|
||||
%div#blob-content-holder.blob-content-holder
|
||||
#blob-content-holder.blob-content-holder
|
||||
%article.file-holder
|
||||
.file-title
|
||||
= blob_icon blob.mode, blob.name
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
%div{ class: container_class }
|
||||
= render 'projects/last_push'
|
||||
|
||||
%div#tree-holder.tree-holder
|
||||
#tree-holder.tree-holder
|
||||
= render 'blob', blob: @blob
|
||||
|
||||
- if can_edit_blob?(@blob)
|
||||
|
|
|
|||
|
|
@ -19,5 +19,5 @@
|
|||
= link_to ci_lint_path, class: 'btn btn-default' do
|
||||
%span CI Lint
|
||||
|
||||
%div.content-list.builds-content-list
|
||||
.content-list.builds-content-list
|
||||
= render "table", builds: @builds, project: @project
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
= link_to new_namespace_project_fork_path(@project.namespace, @project), title: 'Fork project', class: 'btn' do
|
||||
= custom_icon('icon_fork')
|
||||
%span Fork
|
||||
%div.count-with-arrow
|
||||
.count-with-arrow
|
||||
%span.arrow
|
||||
= link_to namespace_project_forks_path(@project.namespace, @project), title: 'Forks', class: 'count' do
|
||||
= @project.forks_count
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
- else
|
||||
= icon('star-o')
|
||||
%span Star
|
||||
%div.count-with-arrow
|
||||
.count-with-arrow
|
||||
%span.arrow
|
||||
%span.count.star-count
|
||||
= @project.star_count
|
||||
|
|
@ -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
|
||||
= icon('star')
|
||||
Star
|
||||
%div.count-with-arrow
|
||||
.count-with-arrow
|
||||
%span.arrow
|
||||
%span.count
|
||||
= @project.star_count
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
- if @commit.status
|
||||
= render "ci_menu"
|
||||
- else
|
||||
%div.block-connector
|
||||
.block-connector
|
||||
= render "projects/diffs/diffs", diffs: @diffs
|
||||
= render "projects/notes/notes_with_form"
|
||||
- if can_collaborate_with_project?
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
- commits, hidden = limited_commits(@commits)
|
||||
- commits = Commit.decorate(commits, @project)
|
||||
|
||||
%div.panel.panel-default
|
||||
.panel.panel-default
|
||||
.panel-heading
|
||||
Commits (#{@commits.count})
|
||||
- if hidden > 0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%div.branch-commit
|
||||
.branch-commit
|
||||
- if deployment.ref
|
||||
.icon-container
|
||||
= deployment.tag? ? icon('tag') : icon('code-fork')
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
%p.image-info= "#{number_to_human_size file.size}"
|
||||
- else
|
||||
.image
|
||||
%div.two-up.view
|
||||
.two-up.view
|
||||
%span.wrap
|
||||
.frame.deleted
|
||||
%a{href: namespace_project_blob_path(@project.namespace, @project, tree_join(diff_file.old_ref, diff.old_path))}
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
%b H:
|
||||
%span.meta-height
|
||||
|
||||
%div.swipe.view.hide
|
||||
.swipe.view.hide
|
||||
.swipe-frame
|
||||
.frame.deleted
|
||||
%img{src: old_file_raw_path, alt: diff.old_path}
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
%span.top-handle
|
||||
%span.bottom-handle
|
||||
|
||||
%div.onion-skin.view.hide
|
||||
.onion-skin.view.hide
|
||||
.onion-skin-frame
|
||||
.frame.deleted
|
||||
%img{src: old_file_raw_path, alt: diff.old_path}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/ 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
|
||||
- last_line = 0
|
||||
- diff_file.parallel_diff_lines.each do |line|
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
.empty_wrapper
|
||||
%h3.page-title-empty
|
||||
Command line instructions
|
||||
%div.git-empty
|
||||
.git-empty
|
||||
%fieldset
|
||||
%h5 Git global setup
|
||||
%pre.light-well
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
%li.file-finder
|
||||
%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.table.files-slider{class: "table_#{@hex_path} tree-table table-striped" }
|
||||
%tbody
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%div#modal_merge_info.modal
|
||||
#modal_merge_info.modal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- if @merge_request_diffs.size > 1
|
||||
.mr-version-controls
|
||||
%div.mr-version-menus-container.content-block
|
||||
.mr-version-menus-container.content-block
|
||||
Changes between
|
||||
%span.dropdown.inline.mr-version-dropdown
|
||||
%a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} }
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
- if git_import_enabled?
|
||||
= link_to "#", class: 'btn js-toggle-button import_git' do
|
||||
= icon('git', text: 'Repo by URL')
|
||||
%div.import_gitlab_project
|
||||
.import_gitlab_project
|
||||
- if gitlab_project_import_enabled?
|
||||
= link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
|
||||
= icon('gitlab', text: 'GitLab export')
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
= link_to ci_lint_path, class: 'btn btn-default' do
|
||||
%span CI Lint
|
||||
|
||||
%div.content-list.pipelines
|
||||
.content-list.pipelines
|
||||
- if @pipelines.blank?
|
||||
%div
|
||||
.nothing-here-block No pipelines to show
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Pipeline"
|
||||
= 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
|
||||
= render "projects/pipelines/info"
|
||||
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@
|
|||
.row-content-block.top-block.content-component-block
|
||||
= render 'award_emoji/awards_block', awardable: @snippet, inline: true
|
||||
|
||||
%div#notes= render "projects/notes/notes_with_form"
|
||||
#notes= render "projects/notes/notes_with_form"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%div.tree-content-holder
|
||||
.tree-content-holder
|
||||
.table-holder
|
||||
%table.table#tree-slider{class: "table_#{@hex_path} tree-table" }
|
||||
%thead
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
%th.hidden-xs
|
||||
.pull-left Last commit
|
||||
.last-commit.hidden-sm.pull-left
|
||||
%small.light
|
||||
%small.light
|
||||
= clipboard_button(clipboard_text: @commit.id)
|
||||
= link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
|
||||
= time_ago_with_tooltip(@commit.committed_date)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
- @no_container = true
|
||||
|
||||
%div{ class: container_class }
|
||||
%div#modal-new-wiki.modal
|
||||
#modal-new-wiki.modal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
.participants-author.js-participants-author
|
||||
= link_to_member(@project, participant, name: false, size: 24)
|
||||
- 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"}}
|
||||
+ #{participants_extra} more
|
||||
:javascript
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
- if issuable.is_a?(Issue)
|
||||
= confidential_icon(issuable)
|
||||
= 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
|
||||
%span.issuable-number >= issuable.to_reference
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
%a.btn.btn-warning#js-u2f-try-again Try again?
|
||||
|
||||
%script#js-register-u2f-registered{ type: "text/template" }
|
||||
%div.row.append-bottom-10
|
||||
.row.append-bottom-10
|
||||
.col-md-12
|
||||
%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
|
||||
|
|
|
|||
Loading…
Reference in a new issue