Make tables full width.

a32f7766 · Douwe Maan · 41615ddd · a32f7766 · a32f7766 · a32f7766
Commit a32f7766 authored Oct 19, 2015 by Douwe Maan
41 changed files
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -94,7 +94,6 @@
          border-right: none;
        }
        background: #fff;
-        padding: 10px $gl-padding;
      }
      .lines {
        pre {

--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -107,7 +107,7 @@ ul.content-list {
  > li {
    padding: $gl-padding;
-    border-color: #f1f2f4;
+    border-color: $table-border-color;
    margin-left: -$gl-padding;
    margin-right: -$gl-padding;
    color: $gl-gray;

--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
+.table-holder {
+  margin: -$gl-padding;
+  margin-top: 0;
+  margin-bottom: 0;
+}
 table {
  &.table {
    .dropdown-menu a {
@@ -18,15 +24,17 @@ table {
    tr {
      td, th {
-        padding: 8px 10px;
+        padding: 10px $gl-padding;
        line-height: 20px;
        vertical-align: middle;
      }
      th {
        font-weight: normal;
        font-size: 15px;
        border-bottom: 1px solid $border-color !important;
      }
      td {
        border-color: $table-border-color !important;
        border-bottom: 1px solid;

--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -6,7 +6,7 @@
  .timeline-entry {
    padding: $gl-padding;
-    border-color: #f1f2f4;
+    border-color: $table-border-color;
    margin-left: -$gl-padding;
    margin-right: -$gl-padding;
    color: $gl-gray;

--- a/app/assets/stylesheets/pages/ci_projects.scss
+++ b/app/assets/stylesheets/pages/ci_projects.scss
@@ -6,11 +6,6 @@
    line-height: 1.5;
  }
-  .wide-table-holder {
-    margin-left: -$gl-padding;
-    margin-right: -$gl-padding;
-  }
  .builds,
  .projects-table {
    .light {

--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -7,7 +7,7 @@
  padding: $gl-padding;
  margin-left: -$gl-padding;
  margin-right: -$gl-padding;
-  border-bottom: 1px solid #f1f2f4;
+  border-bottom: 1px solid $table-border-color;
  color: #7f8fa4;
  &.event-inline {

--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -457,7 +457,7 @@ pre.light-well {
  .project-row {
    padding: $gl-padding;
-    border-color: #f1f2f4;
+    border-color: $table-border-color;
    margin-left: -$gl-padding;
    margin-right: -$gl-padding;

--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
 .tree-holder {
-  .tree-table-holder {
-    margin-left: -$gl-padding;
-    margin-right: -$gl-padding;
-  }
  .tree_progress {
    display: none;
    margin: 20px;
@@ -17,9 +12,7 @@
    tr {
      > td, > th {
-        padding: 10px $gl-padding;
        line-height: 32px;
-        border-color: $table-border-color !important;
      }
      &:hover {

--- a/app/views/admin/abuse_reports/index.html.haml
+++ b/app/views/admin/abuse_reports/index.html.haml
@@ -2,16 +2,17 @@
 %h3.page-title Abuse Reports
 %hr
 - if @abuse_reports.present?
-  %table.table
+  .table-holder
-    %thead
+    %table.table
-      %tr
+      %thead
-        %th Reported by
+        %tr
-        %th Reported at
+          %th Reported by
-        %th Message
+          %th Reported at
-        %th User
+          %th Message
-        %th Primary action
+          %th User
-        %th
+          %th Primary action
-    = render @abuse_reports
+          %th
+      = render @abuse_reports
  = paginate @abuse_reports
 - else
  %h4 There are no abuse reports
--- a/app/views/admin/applications/show.html.haml
+++ b/app/views/admin/applications/show.html.haml
@@ -3,25 +3,26 @@
  Application: #{@application.name}
-%table.table
+.table-holder
-  %tr
+  %table.table
-    %td
+    %tr
-      Application Id
+      %td
-    %td
+        Application Id
-      %code#application_id= @application.uid
+      %td
-  %tr
+        %code#application_id= @application.uid
-    %td
+    %tr
-      Secret:
+      %td
-    %td
+        Secret:
-      %code#secret= @application.secret
+      %td
+        %code#secret= @application.secret
-  %tr
+    %tr
-    %td
+      %td
-      Callback url
+        Callback url
-    %td
+      %td
-      - @application.redirect_uri.split.each do |uri|
+        - @application.redirect_uri.split.each do |uri|
-        %div
+          %div
-          %span.monospace= uri
+            %span.monospace= uri
 .form-actions
  = link_to 'Edit', edit_admin_application_path(@application), class: 'btn btn-primary wide pull-left'
  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -12,24 +12,25 @@
        %i.fa.fa-exclamation-triangle
        There are no running sidekiq processes. Please restart GitLab
    - else
-      %table.table
+      .table-holder
-        %thead
+        %table.table
-          %th USER
+          %thead
-          %th PID
+            %th USER
-          %th CPU
+            %th PID
-          %th MEM
+            %th CPU
-          %th STATE
+            %th MEM
-          %th START
+            %th STATE
-          %th COMMAND
+            %th START
-        %tbody
+            %th COMMAND
-          - @sidekiq_processes.each do |process|
+          %tbody
-            - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
+            - @sidekiq_processes.each do |process|
-            - data = process.strip.split(' ')
+              - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
-            %tr
+              - data = process.strip.split(' ')
-              %td= gitlab_config.user
+              %tr
-              - 5.times do
+                %td= gitlab_config.user
-                %td= data.shift
+                - 5.times do
-              %td= data.join(' ')
+                  %td= data.shift
+                %td= data.join(' ')
      .clearfix
        %p

--- a/app/views/admin/deploy_keys/index.html.haml
+++ b/app/views/admin/deploy_keys/index.html.haml
@@ -5,22 +5,23 @@
    .panel-head-actions
      = link_to 'New Deploy Key', new_admin_deploy_key_path, class: "btn btn-new btn-sm"
  - if @deploy_keys.any?
-    %table.table
+    .table-holder
-      %thead.panel-heading
+      %table.table
-        %tr
+        %thead.panel-heading
-          %th Title
-          %th Fingerprint
-          %th Added at
-          %th
-      %tbody
-        - @deploy_keys.each do |deploy_key|
          %tr
-            %td
+            %th Title
-              %strong= deploy_key.title
+            %th Fingerprint
-            %td
+            %th Added at
-              %code.key-fingerprint= deploy_key.fingerprint
+            %th
-            %td
+        %tbody
-              %span.cgray
+          - @deploy_keys.each do |deploy_key|
-                added #{time_ago_with_tooltip(deploy_key.created_at)}
+            %tr
-            %td
+              %td
-              = link_to 'Remove', admin_deploy_key_path(deploy_key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
+                %strong= deploy_key.title
+              %td
+                %code.key-fingerprint= deploy_key.fingerprint
+              %td
+                %span.cgray
+                  added #{time_ago_with_tooltip(deploy_key.created_at)}
+              %td
+                = link_to 'Remove', admin_deploy_key_path(deploy_key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
--- a/app/views/admin/identities/index.html.haml
+++ b/app/views/admin/identities/index.html.haml
@@ -2,12 +2,13 @@
 = render 'admin/users/head'
 - if @identities.present?
-  %table.table
+  .table-holder
-    %thead
+    %table.table
-      %tr
+      %thead
-        %th Provider
+        %tr
-        %th Identifier
+          %th Provider
-        %th
+          %th Identifier
-    = render @identities
+          %th
+      = render @identities
 - else
  %h4 This user has no identities
--- a/app/views/admin/services/index.html.haml
+++ b/app/views/admin/services/index.html.haml
@@ -2,22 +2,23 @@
 %h3.page-title Service templates
 %p.light Service template allows you to set default values for project services
-%table.table
+.table-holder
-  %thead
+  %table.table
-    %tr
+    %thead
-      %th
+      %tr
-      %th Service
+        %th
-      %th Description
+        %th Service
-      %th Last edit
+        %th Description
-  - @services.sort_by(&:title).each do |service|
+        %th Last edit
-    %tr
+    - @services.sort_by(&:title).each do |service|
-      %td
+      %tr
-        = icon("copy", class: 'clgray')
+        %td
-      %td
+          = icon("copy", class: 'clgray')
-        = link_to edit_admin_application_settings_service_path(service.id) do
+        %td
-          %strong= service.title
+          = link_to edit_admin_application_settings_service_path(service.id) do
-      %td
+            %strong= service.title
-        = service.description
+        %td
-      %td.light
+          = service.description
-        = time_ago_in_words service.updated_at
+        %td.light
-        ago
+          = time_ago_in_words service.updated_at
+          ago
--- a/app/views/ci/admin/events/index.html.haml
+++ b/app/views/ci/admin/events/index.html.haml
-%table.table
+.table-holder
-  %thead
+  %table.table
-    %tr
+    %thead
-      %th User ID
+      %tr
-      %th Description
+        %th User ID
-      %th When
+        %th Description
-  - @events.each do |event|
+        %th When
-    %tr
+    - @events.each do |event|
-      %td
+      %tr
-        = event.user_id
+        %td
-      %td
+          = event.user_id
-        = event.description
+        %td
-      %td.light
+          = event.description
-        = time_ago_in_words event.updated_at
+        %td.light
-        ago
+          = time_ago_in_words event.updated_at
+          ago
 = paginate @events
\ No newline at end of file
--- a/app/views/ci/admin/projects/index.html.haml
+++ b/app/views/ci/admin/projects/index.html.haml
-%table.table
+.table-holder
-  %thead
+  %table.table
-    %tr
+    %thead
-      %th ID
+      %tr
-      %th Name
+        %th ID
-      %th Last build
+        %th Name
-      %th Access
+        %th Last build
-      %th Builds
+        %th Access
-      %th
+        %th Builds
+        %th
-  - @projects.each do |project|
+    - @projects.each do |project|
-    = render "ci/admin/projects/project", project: project
+      = render "ci/admin/projects/project", project: project
 = paginate @projects
--- a/app/views/ci/admin/runners/index.html.haml
+++ b/app/views/ci/admin/runners/index.html.haml
@@ -35,18 +35,19 @@
 %br
-%table.table
+.table-holder
-  %thead
+  %table.table
-    %tr
+    %thead
-      %th Type
+      %tr
-      %th Runner token
+        %th Type
-      %th Description
+        %th Runner token
-      %th Projects
+        %th Description
-      %th Builds
+        %th Projects
-      %th Tags
+        %th Builds
-      %th Last contact
+        %th Tags
-      %th
+        %th Last contact
+        %th
-  - @runners.each do |runner|
+    - @runners.each do |runner|
-    = render "ci/admin/runners/runner", runner: runner
+      = render "ci/admin/runners/runner", runner: runner
 = paginate @runners
--- a/app/views/ci/events/index.html.haml
+++ b/app/views/ci/events/index.html.haml
 %h3.page-title Events
-%table.table
+.table-holder
-  %thead
+  %table.table
-    %tr
+    %thead
-      %th User ID
+      %tr
-      %th Description
+        %th User ID
-      %th When
+        %th Description
-  - @events.each do |event|
+        %th When
-    %tr
+    - @events.each do |event|
-      %td
+      %tr
-        = event.user_id
+        %td
-      %td
+          = event.user_id
-        = event.description
+        %td
-      %td.light
+          = event.description
-        = time_ago_in_words event.updated_at
+        %td.light
-        ago
+          = time_ago_in_words event.updated_at
+          ago
 = paginate @events
\ No newline at end of file
--- a/app/views/ci/lints/_create.html.haml
+++ b/app/views/ci/lints/_create.html.haml
@@ -4,29 +4,30 @@
    syntax is correct
    %i.fa.fa-ok.correct-syntax
-  %table.table.table-bordered
+  .table-holder
-    %thead
+    %table.table.table-bordered
-      %tr
+      %thead
-        %th Parameter
+        %tr
-        %th Value
+          %th Parameter
-    %tbody
+          %th Value
-      - @stages.each do |stage|
+      %tbody
-        - @builds.select { |build| build[:stage] == stage }.each do |build|
+        - @stages.each do |stage|
-          %tr
+          - @builds.select { |build| build[:stage] == stage }.each do |build|
-            %td #{stage.capitalize} Job - #{build[:name]}
+            %tr
-            %td
+              %td #{stage.capitalize} Job - #{build[:name]}
-              %pre
+              %td
-                = simple_format build[:script]
+                %pre
+                  = simple_format build[:script]
-              %br
+                %br
-              %b Tag list:
+                %b Tag list:
-              = build[:tags]
+                = build[:tags]
-              %br
+                %br
-              %b Refs only:
+                %b Refs only:
-              = build[:only] && build[:only].join(", ")
+                = build[:only] && build[:only].join(", ")
-              %br
+                %br
-              %b Refs except:
+                %b Refs except:
-              = build[:except] && build[:except].join(", ")
+                = build[:except] && build[:except].join(", ")
 -else
  %p

--- a/app/views/dashboard/milestones/show.html.haml
+++ b/app/views/dashboard/milestones/show.html.haml
@@ -13,26 +13,28 @@
    %span All issues for this milestone are closed. You may close the milestone now.
 .description
-%table.table
-  %thead
+.table-holder
-    %tr
+  %table.table
-      %th Project
+    %thead
-      %th Open issues
+      %tr
-      %th State
+        %th Project
-      %th Due date
+        %th Open issues
-  - @dashboard_milestone.milestones.each do |milestone|
+        %th State
-    %tr
+        %th Due date
-      %td
+    - @dashboard_milestone.milestones.each do |milestone|
-        = link_to "#{milestone.project.name_with_namespace}", namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone)
+      %tr
-      %td
+        %td
-        = milestone.issues.opened.count
+          = link_to "#{milestone.project.name_with_namespace}", namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone)
-      %td
+        %td
-        - if milestone.closed?
+          = milestone.issues.opened.count
-          Closed
+        %td
-        - else
+          - if milestone.closed?
-          Open
+            Closed
-      %td
+          - else
-        = milestone.expires_at
+            Open
+        %td
+          = milestone.expires_at
 .context
  %p.lead

--- a/app/views/doorkeeper/applications/index.html.haml
+++ b/app/views/doorkeeper/applications/index.html.haml
 - page_title "Applications"
 %h3.page-title Your applications
 %p= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success'
-%table.table.table-striped
-  %thead
+.table-holder
-    %tr
+  %table.table.table-striped
-      %th Name
+    %thead
-      %th Callback URL
+      %tr
-      %th
+        %th Name
-      %th
+        %th Callback URL
-  %tbody
+        %th
-    - @applications.each do |application|
+        %th
-      %tr{:id => "application_#{application.id}"}
+    %tbody
-        %td= link_to application.name, oauth_application_path(application)
+      - @applications.each do |application|
-        %td= application.redirect_uri
+        %tr{:id => "application_#{application.id}"}
-        %td= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link'
+          %td= link_to application.name, oauth_application_path(application)
-        %td= render 'delete_form', application: application
+          %td= application.redirect_uri
+          %td= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link'
+          %td= render 'delete_form', application: application
--- a/app/views/doorkeeper/applications/show.html.haml
+++ b/app/views/doorkeeper/applications/show.html.haml
@@ -2,26 +2,26 @@
 %h3.page-title
  Application: #{@application.name}
+.table-holder
+  %table.table
+    %tr
+      %td
+        Application Id
+      %td
+        %code#application_id= @application.uid
+    %tr
+      %td
+        Secret:
+      %td
+        %code#secret= @application.secret
-%table.table
+    %tr
-  %tr
+      %td
-    %td
+        Callback url
-      Application Id
+      %td
-    %td
+        - @application.redirect_uri.split.each do |uri|
-      %code#application_id= @application.uid
+          %div
-  %tr
+            %span.monospace= uri
-    %td
-      Secret:
-    %td
-      %code#secret= @application.secret
-  %tr
-    %td
-      Callback url
-    %td
-      - @application.redirect_uri.split.each do |uri|
-        %div
-          %span.monospace= uri
 .form-actions
  = link_to 'Edit', edit_oauth_application_path(@application), class: 'btn btn-primary wide pull-left'
  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'
--- a/app/views/doorkeeper/authorized_applications/index.html.haml
+++ b/app/views/doorkeeper/authorized_applications/index.html.haml
 %header.page-header
  %h1 Your authorized applications
 %main{:role => "main"}
-  %table.table.table-striped
+  .table-holder
-    %thead
+    %table.table.table-striped
-      %tr
+      %thead
-        %th Application
-        %th Created At
-        %th
-        %th
-    %tbody
-      - @applications.each do |application|
        %tr
-          %td= application.name
+          %th Application
-          %td= application.created_at.strftime('%Y-%m-%d %H:%M:%S')
+          %th Created At
-          %td= render 'delete_form', application: application
+          %th
\ No newline at end of file
+          %th
+      %tbody
+        - @applications.each do |application|
+          %tr
+            %td= application.name
+            %td= application.created_at.strftime('%Y-%m-%d %H:%M:%S')
+            %td= render 'delete_form', application: application
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -21,26 +21,28 @@
    %span All issues for this milestone are closed. You may close the milestone now.
 .description
-%table.table
-  %thead
+.table-holder
-    %tr
+  %table.table
-      %th Project
+    %thead
-      %th Open issues
+      %tr
-      %th State
+        %th Project
-      %th Due date
+        %th Open issues
-  - @group_milestone.milestones.each do |milestone|
+        %th State
-    %tr
+        %th Due date
-      %td
+    - @group_milestone.milestones.each do |milestone|
-        = link_to "#{milestone.project.name}", namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone)
+      %tr
-      %td
+        %td
-        = milestone.issues.opened.count
+          = link_to "#{milestone.project.name}", namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone)
-      %td
+        %td
-        - if milestone.closed?
+          = milestone.issues.opened.count
-          Closed
+        %td
-        - else
+          - if milestone.closed?
-          Open
+            Closed
-      %td
+          - else
-        = milestone.expires_at
+            Open
+        %td
+          = milestone.expires_at
 .context
  %p.lead

--- a/app/views/import/bitbucket/status.html.haml
+++ b/app/views/import/bitbucket/status.html.haml
@@ -14,45 +14,46 @@
    = button_tag 'Import all projects', class: "btn btn-success js-import-all"
-%table.table.import-jobs
+.table-holder
-  %thead
+  %table.table.import-jobs
-    %tr
+    %thead
-      %th From Bitbucket
+      %tr
-      %th To GitLab
+        %th From Bitbucket
-      %th Status
+        %th To GitLab
-  %tbody
+        %th Status
-    - @already_added_projects.each do |project|
+    %tbody
-      %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
+      - @already_added_projects.each do |project|
-        %td
+        %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
-          = link_to project.import_source, "https://bitbucket.org/#{project.import_source}", target: "_blank"
+          %td
-        %td
+            = link_to project.import_source, "https://bitbucket.org/#{project.import_source}", target: "_blank"
-          %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
+          %td
-        %td.job-status
+            %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
-          - if project.import_status == 'finished'
+          %td.job-status
-            %span
+            - if project.import_status == 'finished'
-              %i.fa.fa-check
+              %span
-              done
+                %i.fa.fa-check
-          - elsif project.import_status == 'started'
+                done
-            %i.fa.fa-spinner.fa-spin
+            - elsif project.import_status == 'started'
-            started
+              %i.fa.fa-spinner.fa-spin
-          - else
+              started
-            = project.human_import_status_name
+            - else
+              = project.human_import_status_name
-    - @repos.each do |repo|
+      - @repos.each do |repo|
-      %tr{id: "repo_#{repo["owner"]}___#{repo["slug"]}"}
+        %tr{id: "repo_#{repo["owner"]}___#{repo["slug"]}"}
-        %td
+          %td
-          = link_to "#{repo["owner"]}/#{repo["slug"]}", "https://bitbucket.org/#{repo["owner"]}/#{repo["slug"]}", target: "_blank"
+            = link_to "#{repo["owner"]}/#{repo["slug"]}", "https://bitbucket.org/#{repo["owner"]}/#{repo["slug"]}", target: "_blank"
-        %td.import-target
+          %td.import-target
-          = "#{repo["owner"]}/#{repo["slug"]}"
+            = "#{repo["owner"]}/#{repo["slug"]}"
-        %td.import-actions.job-status
+          %td.import-actions.job-status
-          = button_tag "Import", class: "btn js-add-to-import"
+            = button_tag "Import", class: "btn js-add-to-import"
-    - @incompatible_repos.each do |repo|
+      - @incompatible_repos.each do |repo|
-      %tr{id: "repo_#{repo["owner"]}___#{repo["slug"]}"}
+        %tr{id: "repo_#{repo["owner"]}___#{repo["slug"]}"}
-        %td
+          %td
-          = link_to "#{repo["owner"]}/#{repo["slug"]}", "https://bitbucket.org/#{repo["owner"]}/#{repo["slug"]}", target: "_blank"
+            = link_to "#{repo["owner"]}/#{repo["slug"]}", "https://bitbucket.org/#{repo["owner"]}/#{repo["slug"]}", target: "_blank"
-        %td.import-target
+          %td.import-target
-        %td.import-actions-job-status
+          %td.import-actions-job-status
-          = label_tag "Incompatible Project", nil, class: "label label-danger"
+            = label_tag "Incompatible Project", nil, class: "label label-danger"
 - if @incompatible_repos.any?
  %p

--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
@@ -25,22 +25,23 @@
        of issues and comments (e.g. "By <a href="#">@johnsmith</a>"). It will also 
        associate and/or assign these issues and comments with the selected user.
-  %table.table
+  .table-holder
-    %thead
+    %table.table
-      %tr
+      %thead
-        %th ID
-        %th Name
-        %th Email
-        %th GitLab User
-    %tbody
-      - @user_map.each do |id, user|
        %tr
-          %td= id
+          %th ID
-          %td= text_field_tag "users[#{id}][name]", user[:name], class: 'form-control'
+          %th Name
-          %td= text_field_tag "users[#{id}][email]", user[:email], class: 'form-control'
+          %th Email
-          %td
+          %th GitLab User
-            = users_select_tag("users[#{id}][gitlab_user]", class: 'custom-form-control',
+      %tbody
-              scope: :all, email_user: true, selected: user[:gitlab_user])
+        - @user_map.each do |id, user|
+          %tr
+            %td= id
+            %td= text_field_tag "users[#{id}][name]", user[:name], class: 'form-control'
+            %td= text_field_tag "users[#{id}][email]", user[:email], class: 'form-control'
+            %td
+              = users_select_tag("users[#{id}][gitlab_user]", class: 'custom-form-control',
+                scope: :all, email_user: true, selected: user[:gitlab_user])
  .form-actions
    = submit_tag 'Continue to the next step', class: 'btn btn-create'

--- a/app/views/import/fogbugz/status.html.haml
+++ b/app/views/import/fogbugz/status.html.haml
@@ -14,38 +14,39 @@
  %p
  = button_tag 'Import all projects', class: 'btn btn-success js-import-all'
-%table.table.import-jobs
+.table-holder
-  %thead
+  %table.table.import-jobs
-    %tr
+    %thead
-      %th From FogBugz
+      %tr
-      %th To GitLab
+        %th From FogBugz
-      %th Status
+        %th To GitLab
-  %tbody
+        %th Status
-    - @already_added_projects.each do |project|
+    %tbody
-      %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
+      - @already_added_projects.each do |project|
-        %td
+        %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
-          = project.import_source
+          %td
-        %td
+            = project.import_source
-          %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
+          %td
-        %td.job-status
+            %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
-          - if project.import_status == 'finished'
+          %td.job-status
-            %span
+            - if project.import_status == 'finished'
-              %i.fa.fa-check
+              %span
-              done
+                %i.fa.fa-check
-          - elsif project.import_status == 'started'
+                done
-            %i.fa.fa-spinner.fa-spin
+            - elsif project.import_status == 'started'
-            started
+              %i.fa.fa-spinner.fa-spin
-          - else
+              started
-            = project.human_import_status_name
+            - else
+              = project.human_import_status_name
-    - @repos.each do |repo|
+      - @repos.each do |repo|
-      %tr{id: "repo_#{repo.id}"}
+        %tr{id: "repo_#{repo.id}"}
-        %td
+          %td
-          = repo.name
+            = repo.name
-        %td.import-target
+          %td.import-target
-          = "#{current_user.username}/#{repo.name}"
+            = "#{current_user.username}/#{repo.name}"
-        %td.import-actions.job-status
+          %td.import-actions.job-status
-          = button_tag "Import", class: "btn js-add-to-import"
+            = button_tag "Import", class: "btn js-add-to-import"
 :coffeescript
  new ImporterStatus("#{jobs_import_fogbugz_path}", "#{import_fogbugz_path}")
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
@@ -9,38 +9,39 @@
 %p
  = button_tag 'Import all projects', class: "btn btn-success js-import-all"
-%table.table.import-jobs
+.table-holder
-  %thead
+  %table.table.import-jobs
-    %tr
+    %thead
-      %th From GitHub
+      %tr
-      %th To GitLab
+        %th From GitHub
-      %th Status
+        %th To GitLab
-  %tbody
+        %th Status
-    - @already_added_projects.each do |project|
+    %tbody
-      %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
+      - @already_added_projects.each do |project|
-        %td
+        %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
-          = link_to project.import_source, "https://github.com/#{project.import_source}", target: "_blank"
+          %td
-        %td
+            = link_to project.import_source, "https://github.com/#{project.import_source}", target: "_blank"
-          %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
+          %td
-        %td.job-status
+            %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
-          - if project.import_status == 'finished'
+          %td.job-status
-            %span
+            - if project.import_status == 'finished'
-              %i.fa.fa-check
+              %span
-              done
+                %i.fa.fa-check
-          - elsif project.import_status == 'started'
+                done
-            %i.fa.fa-spinner.fa-spin
+            - elsif project.import_status == 'started'
-            started
+              %i.fa.fa-spinner.fa-spin
-          - else
+              started
-            = project.human_import_status_name
+            - else
+              = project.human_import_status_name
-    - @repos.each do |repo|
+      - @repos.each do |repo|
-      %tr{id: "repo_#{repo.id}"}
+        %tr{id: "repo_#{repo.id}"}
-        %td
+          %td
-          = link_to repo.full_name, "https://github.com/#{repo.full_name}", target: "_blank"
+            = link_to repo.full_name, "https://github.com/#{repo.full_name}", target: "_blank"
-        %td.import-target
+          %td.import-target
-          = repo.full_name
+            = repo.full_name
-        %td.import-actions.job-status
+          %td.import-actions.job-status
-          = button_tag "Import", class: "btn js-add-to-import"
+            = button_tag "Import", class: "btn js-add-to-import"
 :coffeescript
  new ImporterStatus("#{jobs_import_github_path}", "#{import_github_path}")
--- a/app/views/import/gitlab/status.html.haml
+++ b/app/views/import/gitlab/status.html.haml
@@ -9,38 +9,39 @@
 %p
  = button_tag 'Import all projects', class: "btn btn-success js-import-all"
-%table.table.import-jobs
+.table-holder
-  %thead
+  %table.table.import-jobs
-    %tr
+    %thead
-      %th From GitLab.com
+      %tr
-      %th To this GitLab instance
+        %th From GitLab.com
-      %th Status
+        %th To this GitLab instance
-  %tbody
+        %th Status
-    - @already_added_projects.each do |project|
+    %tbody
-      %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
+      - @already_added_projects.each do |project|
-        %td
+        %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
-          = link_to project.import_source, "https://gitlab.com/#{project.import_source}", target: "_blank"
+          %td
-        %td
+            = link_to project.import_source, "https://gitlab.com/#{project.import_source}", target: "_blank"
-          %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
+          %td
-        %td.job-status
+            %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
-          - if project.import_status == 'finished'
+          %td.job-status
-            %span
+            - if project.import_status == 'finished'
-              %i.fa.fa-check
+              %span
-              done
+                %i.fa.fa-check
-          - elsif project.import_status == 'started'
+                done
-            %i.fa.fa-spinner.fa-spin
+            - elsif project.import_status == 'started'
-            started
+              %i.fa.fa-spinner.fa-spin
-          - else
+              started
-            = project.human_import_status_name
+            - else
+              = project.human_import_status_name
-    - @repos.each do |repo|
+      - @repos.each do |repo|
-      %tr{id: "repo_#{repo["id"]}"}
+        %tr{id: "repo_#{repo["id"]}"}
-        %td
+          %td
-          = link_to repo["path_with_namespace"], "https://gitlab.com/#{repo["path_with_namespace"]}", target: "_blank"
+            = link_to repo["path_with_namespace"], "https://gitlab.com/#{repo["path_with_namespace"]}", target: "_blank"
-        %td.import-target
+          %td.import-target
-          = repo["path_with_namespace"]
+            = repo["path_with_namespace"]
-        %td.import-actions.job-status
+          %td.import-actions.job-status
-          = button_tag "Import", class: "btn js-add-to-import"
+            = button_tag "Import", class: "btn js-add-to-import"
 :coffeescript
  new ImporterStatus("#{jobs_import_gitlab_path}", "#{import_gitlab_path}")
--- a/app/views/import/gitorious/status.html.haml
+++ b/app/views/import/gitorious/status.html.haml
@@ -9,38 +9,39 @@
 %p
  = button_tag 'Import all projects', class: "btn btn-success js-import-all"
-%table.table.import-jobs
+.table-holder
-  %thead
+  %table.table.import-jobs
-    %tr
+    %thead
-      %th From Gitorious.org
+      %tr
-      %th To GitLab
+        %th From Gitorious.org
-      %th Status
+        %th To GitLab
-  %tbody
+        %th Status
-    - @already_added_projects.each do |project|
+    %tbody
-      %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
+      - @already_added_projects.each do |project|
-        %td
+        %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
-          = link_to project.import_source, "https://gitorious.org/#{project.import_source}", target: "_blank"
+          %td
-        %td
+            = link_to project.import_source, "https://gitorious.org/#{project.import_source}", target: "_blank"
-          %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
+          %td
-        %td.job-status
+            %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
-          - if project.import_status == 'finished'
+          %td.job-status
-            %span
+            - if project.import_status == 'finished'
-              %i.fa.fa-check
+              %span
-              done
+                %i.fa.fa-check
-          - elsif project.import_status == 'started'
+                done
-            %i.fa.fa-spinner.fa-spin
+            - elsif project.import_status == 'started'
-            started
+              %i.fa.fa-spinner.fa-spin
-          - else
+              started
-            = project.human_import_status_name
+            - else
+              = project.human_import_status_name
-    - @repos.each do |repo|
+      - @repos.each do |repo|
-      %tr{id: "repo_#{repo.id}"}
+        %tr{id: "repo_#{repo.id}"}
-        %td
+          %td
-          = link_to repo.full_name, "https://gitorious.org/#{repo.full_name}", target: "_blank"
+            = link_to repo.full_name, "https://gitorious.org/#{repo.full_name}", target: "_blank"
-        %td.import-target
+          %td.import-target
-          = repo.full_name
+            = repo.full_name
-        %td.import-actions.job-status
+          %td.import-actions.job-status
-          = button_tag "Import", class: "btn js-add-to-import"
+            = button_tag "Import", class: "btn js-add-to-import"
 :coffeescript
  new ImporterStatus("#{jobs_import_gitorious_path}", "#{import_gitorious_path}")
--- a/app/views/import/google_code/status.html.haml
+++ b/app/views/import/google_code/status.html.haml
@@ -17,45 +17,46 @@
  - else
    = button_tag 'Import all projects', class: "btn btn-success js-import-all"
-%table.table.import-jobs
+.table-holder
-  %thead
+  %table.table.import-jobs
-    %tr
+    %thead
-      %th From Google Code
+      %tr
-      %th To GitLab
+        %th From Google Code
-      %th Status
+        %th To GitLab
-  %tbody
+        %th Status
-    - @already_added_projects.each do |project|
+    %tbody
-      %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
+      - @already_added_projects.each do |project|
-        %td
+        %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
-          = link_to project.import_source, "https://code.google.com/p/#{project.import_source}", target: "_blank"
+          %td
-        %td
+            = link_to project.import_source, "https://code.google.com/p/#{project.import_source}", target: "_blank"
-          %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
+          %td
-        %td.job-status
+            %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
-          - if project.import_status == 'finished'
+          %td.job-status
-            %span
+            - if project.import_status == 'finished'
-              %i.fa.fa-check
+              %span
-              done
+                %i.fa.fa-check
-          - elsif project.import_status == 'started'
+                done
-            %i.fa.fa-spinner.fa-spin
+            - elsif project.import_status == 'started'
-            started
+              %i.fa.fa-spinner.fa-spin
-          - else
+              started
-            = project.human_import_status_name
+            - else
+              = project.human_import_status_name
-    - @repos.each do |repo|
+      - @repos.each do |repo|
-      %tr{id: "repo_#{repo.id}"}
+        %tr{id: "repo_#{repo.id}"}
-        %td
+          %td
-          = link_to repo.name, "https://code.google.com/p/#{repo.name}", target: "_blank"
+            = link_to repo.name, "https://code.google.com/p/#{repo.name}", target: "_blank"
-        %td.import-target
+          %td.import-target
-          = "#{current_user.username}/#{repo.name}"
+            = "#{current_user.username}/#{repo.name}"
-        %td.import-actions.job-status
+          %td.import-actions.job-status
-          = button_tag "Import", class: "btn js-add-to-import"
+            = button_tag "Import", class: "btn js-add-to-import"
-    - @incompatible_repos.each do |repo|
+      - @incompatible_repos.each do |repo|
-      %tr{id: "repo_#{repo.id}"}
+        %tr{id: "repo_#{repo.id}"}
-        %td
+          %td
-          = link_to repo.name, "https://code.google.com/p/#{repo.name}", target: "_blank"
+            = link_to repo.name, "https://code.google.com/p/#{repo.name}", target: "_blank"
-        %td.import-target
+          %td.import-target
-        %td.import-actions-job-status
+          %td.import-actions-job-status
-          = label_tag "Incompatible Project", nil, class: "label label-danger"
+            = label_tag "Incompatible Project", nil, class: "label label-danger"
 - if @incompatible_repos.any?
  %p

--- a/app/views/profiles/_event_table.html.haml
+++ b/app/views/profiles/_event_table.html.haml
-%table.table#audits
+.table-holder
-  %thead
+  %table.table#audits
-    %tr
+    %thead
-      %th Action
-      %th When
-  %tbody
-    - events.each do |event|
      %tr
-        %td
+        %th Action
-          %span
+        %th When
-            Signed in with 
-            %b= event.details[:with]
+    %tbody
-            authentication
+      - events.each do |event|
-        %td #{time_ago_in_words event.created_at} ago
+        %tr
+          %td
+            %span
+              Signed in with 
+              %b= event.details[:with]
+              authentication
+          %td #{time_ago_in_words event.created_at} ago
 = paginate events, theme: "gitlab"
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -32,21 +32,22 @@
    %li
      .nothing-here-block No builds to show
  - else
-    %table.table.builds
+    .table-holder
-      %thead
+      %table.table.builds
-        %tr
+        %thead
-          %th Status
+          %tr
-          %th Build ID
+            %th Status
-          %th Commit
+            %th Build ID
-          %th Ref
+            %th Commit
-          %th Runner
+            %th Ref
-          %th Name
+            %th Runner
-          %th Duration
+            %th Name
-          %th Finished at
+            %th Duration
-          %th
+            %th Finished at
+            %th
-      - @builds.each do |build|
-        = render 'projects/builds/build', build: build
+        - @builds.each do |build|
+          = render 'projects/builds/build', build: build
    = paginate @builds
--- a/app/views/projects/ci_web_hooks/index.html.haml
+++ b/app/views/projects/ci_web_hooks/index.html.haml
@@ -20,17 +20,18 @@
 -if @web_hooks.any?
  %h4 Activated web hooks (#{@web_hooks.count})
-  %table.table
+  .table-holder
-    - @web_hooks.each do |hook|
+    %table.table
-      %tr
+      - @web_hooks.each do |hook|
-        %td
+        %tr
-          .clearfix
+          %td
-            %span.monospace= hook.url
+            .clearfix
-        %td
+              %span.monospace= hook.url
-          .pull-right
+          %td
-            - if @ci_project.commits.any?
+            .pull-right
-              = link_to 'Test Hook', test_namespace_project_ci_web_hook_path(@project.namespace, @project, hook), class: "btn btn-sm btn-grouped"
+              - if @ci_project.commits.any?
-            = link_to 'Remove', namespace_project_ci_web_hook_path(@project.namespace, @project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
+                = link_to 'Test Hook', test_namespace_project_ci_web_hook_path(@project.namespace, @project, hook), class: "btn btn-sm btn-grouped"
+              = link_to 'Remove', namespace_project_ci_web_hook_path(@project.namespace, @project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
 %h4 Web Hook data example

--- a/app/views/projects/commit/ci.html.haml
+++ b/app/views/projects/commit/ci.html.haml
@@ -29,27 +29,7 @@
      - if @ci_commit.builds.running_or_pending.any?
        = link_to "Cancel all", cancel_builds_namespace_project_commit_path(@project.namespace, @project, @commit.sha), class: 'btn btn-xs btn-danger'
-%table.table.builds
+.table-holder
-  %thead
-    %tr
-      %th Status
-      %th Build ID
-      %th Ref
-      %th Stage
-      %th Name
-      %th Duration
-      %th Finished at
-      - if @ci_project && @ci_project.coverage_enabled?
-        %th Coverage
-      %th
-  - @ci_commit.refs.each do |ref|
-    = render partial: "projects/commit_statuses/commit_status", collection: @ci_commit.statuses.for_ref(ref).latest.ordered,
-             locals: { coverage: @ci_project.try(:coverage_enabled?), allow_retry: true }
- if @ci_commit.retried.any?
-  .gray-content-block.second-block
-    Retried builds
  %table.table.builds
    %thead
      %tr
@@ -63,5 +43,27 @@
        - if @ci_project && @ci_project.coverage_enabled?
          %th Coverage
        %th
-    = render partial: "projects/commit_statuses/commit_status", collection: @ci_commit.retried,
+    - @ci_commit.refs.each do |ref|
-             locals: { coverage: @ci_project.try(:coverage_enabled?) }
+      = render partial: "projects/commit_statuses/commit_status", collection: @ci_commit.statuses.for_ref(ref).latest.ordered,
+               locals: { coverage: @ci_project.try(:coverage_enabled?), allow_retry: true }
+- if @ci_commit.retried.any?
+  .gray-content-block.second-block
+    Retried builds
+  .table-holder
+    %table.table.builds
+      %thead
+        %tr
+          %th Status
+          %th Build ID
+          %th Ref
+          %th Stage
+          %th Name
+          %th Duration
+          %th Finished at
+          - if @ci_project && @ci_project.coverage_enabled?
+            %th Coverage
+          %th
+      = render partial: "projects/commit_statuses/commit_status", collection: @ci_commit.retried,
+               locals: { coverage: @ci_project.try(:coverage_enabled?) }
--- a/app/views/projects/protected_branches/_branches_list.html.haml
+++ b/app/views/projects/protected_branches/_branches_list.html.haml
 - unless @branches.empty?
  %br
  %h4 Already Protected:
-  %table.table.protected-branches-list
+  .table-holder
-    %thead
+    %table.table.protected-branches-list
-      %tr.no-border
+      %thead
-        %th Branch
+        %tr.no-border
-        %th Developers can push
+          %th Branch
-        %th Last commit
+          %th Developers can push
-        %th
+          %th Last commit
+          %th
-    %tbody
+      %tbody
-      - @branches.each do |branch|
+        - @branches.each do |branch|
-        - @url = namespace_project_protected_branch_path(@project.namespace, @project, branch)
+          - @url = namespace_project_protected_branch_path(@project.namespace, @project, branch)
-        %tr
+          %tr
-          %td
-            = link_to namespace_project_commits_path(@project.namespace, @project, branch.name) do
-              %strong= branch.name
-              - if @project.root_ref?(branch.name)
-                %span.label.label-info default
            %td
-              = check_box_tag "developers_can_push", branch.id, branch.developers_can_push, "data-url" => @url
+              = link_to namespace_project_commits_path(@project.namespace, @project, branch.name) do
-            %td
+                %strong= branch.name
-              - if commit = branch.commit
+                - if @project.root_ref?(branch.name)
-                = link_to namespace_project_commit_path(@project.namespace, @project, commit.id), class: 'commit_short_id' do
+                  %span.label.label-info default
-                  = commit.short_id
+              %td
-                &middot;
+                = check_box_tag "developers_can_push", branch.id, branch.developers_can_push, "data-url" => @url
-                #{time_ago_with_tooltip(commit.committed_date)}
+              %td
-              - else
+                - if commit = branch.commit
-                (branch was removed from repository)
+                  = link_to namespace_project_commit_path(@project.namespace, @project, commit.id), class: 'commit_short_id' do
-            %td
+                    = commit.short_id
-              .pull-right
+                  &middot;
-                - if can? current_user, :admin_project, @project
+                  #{time_ago_with_tooltip(commit.committed_date)}
-                  = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-remove btn-sm"
+                - else
+                  (branch was removed from repository)
+              %td
+                .pull-right
+                  - if can? current_user, :admin_project, @project
+                    = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-remove btn-sm"
--- a/app/views/projects/runners/show.html.haml
+++ b/app/views/projects/runners/show.html.haml
@@ -9,56 +9,57 @@
        %span.runner-state.runner-state-specific
          Specific
-%table.table
+.table-holder
-  %thead
+  %table.table
+    %thead
+      %tr
+        %th Property Name
+        %th Value
    %tr
-      %th Property Name
+      %td
-      %th Value
+        Tags
-  %tr
+      %td
-    %td
+        - @runner.tag_list.each do |tag|
-      Tags
+          %span.label.label-primary
-    %td
+            = tag
-      - @runner.tag_list.each do |tag|
+    %tr
-        %span.label.label-primary
+      %td
-          = tag
+        Name
-  %tr
+      %td
-    %td
+        = @runner.name
-      Name
+    %tr
-    %td
+      %td
-      = @runner.name
+        Version
-  %tr
+      %td
-    %td
+        = @runner.version
-      Version
+    %tr
-    %td
+      %td
-      = @runner.version
+        Revision
-  %tr
+      %td
-    %td
+        = @runner.revision
-      Revision
+    %tr
-    %td
+      %td
-      = @runner.revision
+        Platform
-  %tr
+      %td
-    %td
+        = @runner.platform
-      Platform
+    %tr
-    %td
+      %td
-      = @runner.platform
+        Architecture
-  %tr
+      %td
-    %td
+        = @runner.architecture
-      Architecture
+    %tr
-    %td
+      %td
-      = @runner.architecture
+        Description
-  %tr
+      %td
-    %td
+        = @runner.description
-      Description
+    %tr
-    %td
+      %td
-      = @runner.description
+        Last contact
-  %tr
+      %td
-    %td
+        - if @runner.contacted_at
-      Last contact
+          #{time_ago_in_words(@runner.contacted_at)} ago
-    %td
+        - else
-      - if @runner.contacted_at
+          Never
-        #{time_ago_in_words(@runner.contacted_at)} ago
-      - else
-        Never
--- a/app/views/projects/services/index.html.haml
+++ b/app/views/projects/services/index.html.haml
@@ -2,22 +2,23 @@
 %h3.page-title Project services
 %p.light Project services allow you to integrate GitLab with other applications
-%table.table
+.table-holder
-  %thead
+  %table.table
-    %tr
+    %thead
-      %th
+      %tr
-      %th Service
+        %th
-      %th Description
+        %th Service
-      %th Last edit
+        %th Description
-  - @services.sort_by(&:title).each do |service|
+        %th Last edit
-    %tr
+    - @services.sort_by(&:title).each do |service|
-      %td
+      %tr
-        = boolean_to_icon service.activated?
+        %td
-      %td
+          = boolean_to_icon service.activated?
-        = link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
+        %td
-          %strong= service.title
+          = link_to edit_namespace_project_service_path(@project.namespace, @project, service.to_param) do
-      %td
+            %strong= service.title
-        = service.description
+        %td
-      %td.light
+          = service.description
-        = time_ago_in_words service.updated_at
+        %td.light
-        ago
+          = time_ago_in_words service.updated_at
+          ago
--- a/app/views/projects/tree/_tree.html.haml
+++ b/app/views/projects/tree/_tree.html.haml
@@ -30,7 +30,7 @@
                New directory
 %div#tree-content-holder.tree-content-holder
-  .tree-table-holder
+  .table-holder
    %table.table#tree-slider{class: "table_#{@hex_path} tree-table table-striped" }
      %thead
        %tr

--- a/app/views/projects/triggers/index.html.haml
+++ b/app/views/projects/triggers/index.html.haml
@@ -7,12 +7,13 @@
 %hr.clearfix
 -if @triggers.any?
-  %table.table
+  .table-holder
-    %thead
+    %table.table
-      %th Token
+      %thead
-      %th Last used
+        %th Token
-      %th
+        %th Last used
-    = render partial: 'trigger', collection: @triggers, as: :trigger
+        %th
+      = render partial: 'trigger', collection: @triggers, as: :trigger
 - else
  %h4 No triggers

--- a/app/views/projects/wikis/history.html.haml
+++ b/app/views/projects/wikis/history.html.haml
@@ -7,28 +7,29 @@
    %span.light History for
    = link_to @page.title, namespace_project_wiki_path(@project.namespace, @project, @page)
-%table.table
+.table-holder
-  %thead
+  %table.table
-    %tr
+    %thead
-      %th Page version
-      %th Author
-      %th Commit Message
-      %th Last updated
-      %th Format
-  %tbody
-    - @page.versions.each_with_index do |version, index|
-      - commit = version
      %tr
-        %td
+        %th Page version
-          = link_to project_wiki_path_with_version(@project, @page,
+        %th Author
-                                                   commit.id, index == 0) do
+        %th Commit Message
-            = truncate_sha(commit.id)
+        %th Last updated
-        %td
+        %th Format
-          = commit.author.name
+    %tbody
-        %td
+      - @page.versions.each_with_index do |version, index|
-          = commit.message
+        - commit = version
-        %td
+        %tr
-          #{time_ago_with_tooltip(version.authored_date)}
+          %td
-        %td
+            = link_to project_wiki_path_with_version(@project, @page,
-          %strong
+                                                     commit.id, index == 0) do
-            = @page.page.wiki.page(@page.page.name, commit.id).try(:format)
+              = truncate_sha(commit.id)
+          %td
+            = commit.author.name
+          %td
+            = commit.message
+          %td
+            #{time_ago_with_tooltip(version.authored_date)}
+          %td
+            %strong
+              = @page.page.wiki.page(@page.page.name, commit.id).try(:format)