Fully embrace Ruby 1.9 hash syntax

Didn't bother with files in db/, config/, or features/

10 files changed, 129 insertions, 129 deletions

diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index 08eea5538fb..654d6cd12be 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -1,15 +1,15 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           New Issue was created and assigned to you.
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           = "Issue ##{@issue.id}"
-          = link_to_gfm truncate(@issue.title, :length => 45), project_issue_url(@issue.project, @issue), :title => @issue.title
+          = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
         %br
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 4bacff5060c..151aac451fb 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -1,18 +1,18 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           = "New Merge Request !#{@merge_request.id}"
-          = link_to_gfm truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request)
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+          = link_to_gfm truncate(@merge_request.title, length: 16), project_merge_request_url(@merge_request.project, @merge_request)
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
           Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
           Asignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
       %td
 
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml
index b0f198a50fd..d96afc92fe2 100644
--- a/app/views/notify/new_user_email.html.haml
+++ b/app/views/notify/new_user_email.html.haml
@@ -1,23 +1,23 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           Hi #{@user['name']}!
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
           Administrator created account for you. Now you are a member of company gitlab application.
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}
           login..........................................
           %code= @user['email']
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}
           password..................................
           %code= @password
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
           = link_to "Click here to login", root_url
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
 
diff --git a/app/views/notify/note_commit_email.html.haml b/app/views/notify/note_commit_email.html.haml
index 6994f1a6340..e87f9c120e4 100644
--- a/app/views/notify/note_commit_email.html.haml
+++ b/app/views/notify/note_commit_email.html.haml
@@ -1,23 +1,23 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           = "New comment for Commit #{@commit.short_id}"
-          = link_to_gfm truncate(@commit.title, :length => 16), project_commit_url(@note.project, :id => @commit.id, :anchor => "note_#{@note.id}")
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+          = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{:href => "#", :style => "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
           left next message:
         %br
-          %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
+          %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
             %tr
-              %td{:valign => "top"}
-                %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
+              %td{valign: "top"}
+                %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
                   = markdown(@note.note)
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
 
diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml
index 34d9b800c1e..832f5df4463 100644
--- a/app/views/notify/note_issue_email.html.haml
+++ b/app/views/notify/note_issue_email.html.haml
@@ -1,23 +1,23 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           = "New comment for Issue ##{@issue.id}"
-          = link_to_gfm truncate(@issue.title, :length => 35), project_issue_url(@issue.project, @issue, :anchor => "note_#{@note.id}")
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+          = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{:href => "#", :style => "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
           left next message:
         %br
-          %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
+          %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
             %tr
-              %td{:valign => "top"}
-                %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
+              %td{valign: "top"}
+                %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
                   = markdown(@note.note)
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
 
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index 20e7679d4dc..764cd094b76 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -1,23 +1,23 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           = "New comment for Merge Request !#{@merge_request.id}"
-          = link_to_gfm truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request, :anchor => "note_#{@note.id}")
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+          = link_to_gfm truncate(@merge_request.title, length: 16), project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}")
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{:href => "#", :style => "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
           left next message:
         %br
-          %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
+          %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
             %tr
-              %td{:valign => "top"}
-                %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
+              %td{valign: "top"}
+                %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
                   = markdown(@note.note)
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
 
diff --git a/app/views/notify/note_wall_email.html.haml b/app/views/notify/note_wall_email.html.haml
index f62e1f917cd..0661c5801b8 100644
--- a/app/views/notify/note_wall_email.html.haml
+++ b/app/views/notify/note_wall_email.html.haml
@@ -1,22 +1,22 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           New message on
-          = link_to "Project Wall", wall_project_url(@note.project, :anchor => "note_#{@note.id}")
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+          = link_to "Project Wall", wall_project_url(@note.project, anchor: "note_#{@note.id}")
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{:href => "#", :style => "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
           left next message:
         %br
-          %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
+          %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
             %tr
-              %td{:valign => "top"}
-                %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
+              %td{valign: "top"}
+                %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
                   = markdown(@note.note)
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
diff --git a/app/views/notify/note_wiki_email.html.haml b/app/views/notify/note_wiki_email.html.haml
index 591319515f6..d3840cdac06 100644
--- a/app/views/notify/note_wiki_email.html.haml
+++ b/app/views/notify/note_wiki_email.html.haml
@@ -1,23 +1,23 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           New comment for Wiki page
-          = link_to_gfm @wiki.title, project_issue_url(@wiki.project, @wiki, :anchor => "note_#{@note.id}")
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+          = link_to_gfm @wiki.title, project_issue_url(@wiki.project, @wiki, anchor: "note_#{@note.id}")
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{:href => "#", :style => "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
           commented on Wiki page:
         %br
-          %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
+          %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
             %tr
-              %td{:valign => "top"}
-                %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
+              %td{valign: "top"}
+                %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
                   = markdown(@note.note)
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
 
diff --git a/app/views/notify/reassigned_issue_email.html.haml b/app/views/notify/reassigned_issue_email.html.haml
index 26ddc13336a..c7896af3a54 100644
--- a/app/views/notify/reassigned_issue_email.html.haml
+++ b/app/views/notify/reassigned_issue_email.html.haml
@@ -1,16 +1,16 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           = "Reassigned Issue ##{@issue.id}"
-          = link_to_gfm truncate(@issue.title, :length => 16), project_issue_url(@issue.project, @issue)
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+          = link_to_gfm truncate(@issue.title, length: 16), project_issue_url(@issue.project, @issue)
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
           Assignee changed from #{@previous_assignee.name} to #{@issue.assignee_name}
       %td
 
diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml
index e9f657c131f..e49b783635c 100644
--- a/app/views/notify/reassigned_merge_request_email.html.haml
+++ b/app/views/notify/reassigned_merge_request_email.html.haml
@@ -1,16 +1,16 @@
-%td.content{:align => "left", :style => "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", :valign => "top", :width => "600"}
-  %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :style => "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", :width => "600"}
+%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
+  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:align => "left", :style => "padding: 20px 0 0;"}
-        %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{align: "left", style: "padding: 20px 0 0;"}
+        %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
           = "Reassigned Merge Request !#{@merge_request.id}"
-          = link_to_gfm truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request)
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
+          = link_to_gfm truncate(@merge_request.title, length: 16), project_merge_request_url(@merge_request.project, @merge_request)
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
     %tr
-      %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
-      %td{:style => "padding: 15px 0 15px;", :valign => "top"}
-        %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
+      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
+      %td{style: "padding: 15px 0 15px;", valign: "top"}
+        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
           Assignee changed from #{@previous_assignee.name} to #{@merge_request.assignee_name}
       %td