Download as
Browse Code »

Commit 26afde94fda0026fd52078427e3f52e804ba8404

Authored by Dmitriy Zaporozhets
2 parents 45e208cb c76764b7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2250 from jouve/fix_missing_tr_in_thead 

add missing mandatory tr in thead
Showing 5 changed files with 42 additions and 36 deletions   Show diff stats
app/views/admin/groups/index.html.haml
  Diff comments   View file @26afde9
@@ -12,13 +12,14 @@ @@ -12,13 +12,14 @@
12 12
13 %table 13 %table
14 %thead 14 %thead
15 - %th  
16 - Name  
17 - %i.icon-sort-down  
18 - %th Path  
19 - %th Projects  
20 - %th Owner  
21 - %th.cred Danger Zone! 15 + %tr
  16 + %th
  17 + Name
  18 + %i.icon-sort-down
  19 + %th Path
  20 + %th Projects
  21 + %th Owner
  22 + %th.cred Danger Zone!
22 23
23 - @groups.each do |group| 24 - @groups.each do |group|
24 %tr 25 %tr
app/views/admin/projects/index.html.haml
  Diff comments   View file @26afde9
@@ -9,14 +9,15 @@ @@ -9,14 +9,15 @@
9 9
10 %table 10 %table
11 %thead 11 %thead
12 - %th  
13 - Name  
14 - %i.icon-sort-down  
15 - %th Path  
16 - %th Team Members  
17 - %th Last Commit  
18 - %th Edit  
19 - %th.cred Danger Zone! 12 + %tr
  13 + %th
  14 + Name
  15 + %i.icon-sort-down
  16 + %th Path
  17 + %th Team Members
  18 + %th Last Commit
  19 + %th Edit
  20 + %th.cred Danger Zone!
20 21
21 - @projects.each do |project| 22 - @projects.each do |project|
22 %tr 23 %tr
app/views/admin/users/index.html.haml
  Diff comments   View file @26afde9
@@ -21,15 +21,16 @@ @@ -21,15 +21,16 @@
21 21
22 %table 22 %table
23 %thead 23 %thead
24 - %th Admin  
25 - %th  
26 - Name  
27 - %i.icon-sort-down  
28 - %th Username  
29 - %th Email  
30 - %th Projects  
31 - %th Edit  
32 - %th.cred Danger Zone! 24 + %tr
  25 + %th Admin
  26 + %th
  27 + Name
  28 + %i.icon-sort-down
  29 + %th Username
  30 + %th Email
  31 + %th Projects
  32 + %th Edit
  33 + %th.cred Danger Zone!
33 34
34 - @admin_users.each do |user| 35 - @admin_users.each do |user|
35 %tr 36 %tr
app/views/milestones/show.html.haml
  Diff comments   View file @26afde9
@@ -59,10 +59,11 @@ @@ -59,10 +59,11 @@
59 .span6 59 .span6
60 %table.milestone-issue-filter 60 %table.milestone-issue-filter
61 %thead 61 %thead
62 - %th  
63 - %ul.nav.nav-pills  
64 - %li.active= link_to('Open Issues', '#')  
65 - %li=link_to('All Issues', '#') 62 + %tr
  63 + %th
  64 + %ul.nav.nav-pills
  65 + %li.active= link_to('Open Issues', '#')
  66 + %li=link_to('All Issues', '#')
66 - @issues.each do |issue| 67 - @issues.each do |issue|
67 %tr{data: {closed: issue.closed}} 68 %tr{data: {closed: issue.closed}}
68 %td 69 %td
@@ -74,10 +75,11 @@ @@ -74,10 +75,11 @@
74 .span6 75 .span6
75 %table.milestone-merge-requests-filter 76 %table.milestone-merge-requests-filter
76 %thead 77 %thead
77 - %th  
78 - %ul.nav.nav-pills  
79 - %li.active= link_to('Open Merge Requests', '#')  
80 - %li=link_to('All Merge Requests', '#') 78 + %tr
  79 + %th
  80 + %ul.nav.nav-pills
  81 + %li.active= link_to('Open Merge Requests', '#')
  82 + %li=link_to('All Merge Requests', '#')
81 - @merge_requests.each do |merge_request| 83 - @merge_requests.each do |merge_request|
82 %tr{data: {closed: merge_request.closed}} 84 %tr{data: {closed: merge_request.closed}}
83 %td 85 %td
app/views/tree/_tree.html.haml
  Diff comments   View file @26afde9
@@ -16,10 +16,11 @@ @@ -16,10 +16,11 @@
16 - else 16 - else
17 %table#tree-slider{class: "table_#{@hex_path} tree-table" } 17 %table#tree-slider{class: "table_#{@hex_path} tree-table" }
18 %thead 18 %thead
19 - %th Name  
20 - %th Last Update  
21 - %th Last Commit  
22 - %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right" 19 + %tr
  20 + %th Name
  21 + %th Last Update
  22 + %th Last Commit
  23 + %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right"
23 24
24 - if tree.up_dir? 25 - if tree.up_dir?
25 %tr.tree-item 26 %tr.tree-item