Merge branch 'code_style_fixes' into 'master'
Remove unnecessary parens and other code style fixes This MR is based on reviewers` comments to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440 See merge request !5015
This commit is contained in:
Robert Speicher
commit
f991b7fce6
41 changed files with 44 additions and 45 deletions
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Background Jobs"
|
||||
= render 'admin/background_jobs/head'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
%h3.page-title Background Jobs
|
||||
%p.light GitLab uses #{link_to "sidekiq", "http://sidekiq.org/"} library for async job processing
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
- @no_container = true
|
||||
= render "admin/dashboard/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
|
||||
.top-area
|
||||
%ul.nav-links
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
- @no_container = true
|
||||
= render "admin/dashboard/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.admin-dashboard.prepend-top-default
|
||||
.row
|
||||
.col-md-4
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Groups"
|
||||
= render "admin/dashboard/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
%h3.page-title
|
||||
Groups (#{number_with_delimiter(@groups.total_count)})
|
||||
|
||||
|
|
@ -39,7 +39,6 @@
|
|||
= link_to 'New Group', new_admin_group_path, class: "btn btn-new"
|
||||
|
||||
%ul.content-list
|
||||
- @groups.each do |group|
|
||||
= render 'group', group: group
|
||||
= render @groups
|
||||
|
||||
= paginate @groups, theme: "gitlab"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Health Check"
|
||||
= render 'admin/background_jobs/head'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
%h3.page-title
|
||||
Health Check
|
||||
.bs-callout.clearfix
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
Gitlab::RepositoryCheckLogger]
|
||||
= render 'admin/background_jobs/head'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
%ul.nav-links.log-tabs
|
||||
- loggers.each do |klass|
|
||||
%li{ class: (klass == Gitlab::GitLogger ? 'active' : '') }
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
= render 'shared/show_aside'
|
||||
= render "admin/dashboard/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.row.prepend-top-default
|
||||
%aside.col-md-3
|
||||
.panel.admin-filter
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
- @no_container = true
|
||||
= render "admin/dashboard/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
|
||||
%p.prepend-top-default
|
||||
%span
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "System Info"
|
||||
= render 'admin/background_jobs/head'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.prepend-top-default
|
||||
.row
|
||||
.col-sm-4
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
= render 'shared/show_aside'
|
||||
= render "admin/dashboard/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.admin-filter
|
||||
%ul.nav-links
|
||||
%li{class: "#{'active' unless params[:filter]}"}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
= auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
|
||||
|
||||
.cover-block.groups-cover-block
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
= link_to group_icon(@group), target: '_blank' do
|
||||
= image_tag group_icon(@group), class: "avatar group-avatar s70"
|
||||
.group-info
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- empty_repo = @project.empty_repo?
|
||||
.project-home-panel.cover-block.clearfix{:class => ("empty-project" if empty_repo)}
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.row
|
||||
.project-image-container
|
||||
= project_icon(@project, alt: '', class: 'project-avatar avatar s70')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
- if event = last_push_event
|
||||
- if show_last_push_widget?(event)
|
||||
.row-content-block.top-block.clear-block.hidden-xs
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.event-last-push
|
||||
.event-last-push-text
|
||||
%span You pushed to
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title @blob.path, @ref
|
||||
= render "projects/commits/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
= render 'projects/last_push'
|
||||
|
||||
%div#tree-holder.tree-holder
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Branches"
|
||||
= render "projects/commits/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.nav-text
|
||||
Protected branches can be managed in project settings
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
= sort_title_recently_updated
|
||||
= link_to namespace_project_branches_path(sort: 'last_updated') do
|
||||
= sort_title_oldest_updated
|
||||
- unless @branches.empty?
|
||||
- if @branches.any?
|
||||
%ul.content-list.all-branches
|
||||
- @branches.each do |branch|
|
||||
= render "projects/branches/branch", branch: branch
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Builds"
|
||||
= render "projects/pipelines/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
%ul.nav-links
|
||||
%li{class: ('active' if @scope.nil?)}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
= render "head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.row-content-block.second-block.content-component-block
|
||||
.tree-ref-holder
|
||||
= render 'shared/ref_switcher', destination: 'commits'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Compare"
|
||||
= render "projects/commits/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.sub-header-block
|
||||
Compare branches, tags or commit ranges.
|
||||
%br
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "#{params[:from]}...#{params[:to]}"
|
||||
= render "projects/commits/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.sub-header-block.no-bottom-space
|
||||
= render "form"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Environments"
|
||||
= render "projects/pipelines/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
- if can?(current_user, :create_environment, @project) && !@environments.blank?
|
||||
.top-area
|
||||
.nav-controls
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Environments"
|
||||
= render "projects/pipelines/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.col-md-9
|
||||
%h3.page-title= @environment.name.titleize
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Continuous Integration", "Graphs"
|
||||
= render 'head'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.sub-header-block
|
||||
.oneline
|
||||
A collection of graphs for Continuous Integration
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Commits", "Graphs"
|
||||
= render 'head'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.sub-header-block
|
||||
.tree-ref-holder
|
||||
= render 'shared/ref_switcher', destination: 'graphs_commits'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Languages", "Graphs"
|
||||
= render 'head'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.sub-header-block
|
||||
.oneline
|
||||
Programming languages used in this repository
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Contributors", "Graphs"
|
||||
= render 'head'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.sub-header-block
|
||||
.tree-ref-holder
|
||||
= render 'shared/ref_switcher', destination: 'graphs'
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
- if current_user
|
||||
= auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
= render 'shared/issuable/nav', type: :issues
|
||||
.nav-controls
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
- hide_class = ''
|
||||
= render "projects/issues/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area.adjust
|
||||
.nav-text
|
||||
Labels can be applied to issues and merge requests. Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
= render "projects/issues/head"
|
||||
= render 'projects/last_push'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
= render 'shared/issuable/nav', type: :merge_requests
|
||||
.nav-controls
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Milestones"
|
||||
= render "projects/issues/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
= render 'shared/milestones_filter'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- @no_container = true
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.row-content-block.second-block.content-component-block
|
||||
.tree-ref-holder
|
||||
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
= page_specific_javascript_tag('network/application.js')
|
||||
= render "projects/commits/head"
|
||||
= render "head"
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.project-network
|
||||
.controls
|
||||
= form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f|
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Pipelines"
|
||||
= render "projects/pipelines/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
%ul.nav-links
|
||||
%li{class: ('active' if @scope.nil?)}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
= render "home_panel"
|
||||
|
||||
.project-stats.row-content-block.second-block
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
%ul.nav
|
||||
%li
|
||||
= link_to project_files_path(@project) do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Tags"
|
||||
= render "projects/commits/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.nav-text
|
||||
Tags give the ability to mark specific points in history as being important
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
= sort_title_oldest_updated
|
||||
|
||||
.tags
|
||||
- unless @tags.empty?
|
||||
- if @tags.any?
|
||||
%ul.content-list
|
||||
= render partial: 'tag', collection: @tags
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
= render 'projects/last_push'
|
||||
= render "projects/commits/head"
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.tree-controls
|
||||
= render 'projects/find_file_link'
|
||||
- if can? current_user, :download_code, @project
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- @no_container = true
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
%div#modal-new-wiki.modal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Edit", @page.title.capitalize, "Wiki"
|
||||
= render 'nav'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.nav-text
|
||||
%strong
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title "Git Access", "Wiki"
|
||||
|
||||
= render 'nav'
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.sub-header-block
|
||||
%span.oneline
|
||||
Git access for
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- page_title "History", @page.title.capitalize, "Wiki"
|
||||
= render 'nav'
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.nav-text
|
||||
%strong
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
= render 'nav'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
%ul.content-list
|
||||
- @wiki_pages.each do |wiki_page|
|
||||
%li
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
- page_title @page.title.capitalize, "Wiki"
|
||||
= render 'nav'
|
||||
|
||||
%div{ class: (container_class) }
|
||||
%div{ class: container_class }
|
||||
.top-area
|
||||
.nav-text
|
||||
%strong= @page.title.capitalize
|
||||
|
|
|
|||
Loading…
Reference in a new issue