Merge branch 'sh-fix-pipeline-success-ruby21' into 'master'

Use Hash rocket syntax to maintain Ruby 2.1 compatibility Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/5258614 Closes #23498 See merge request !6972

Merge branch 'sh-fix-pipeline-success-ruby21' into 'master'
f64e36c4 · Stan Hu · a88ab269 · 83b57067 · f64e36c4
Commit f64e36c4 authored Oct 19, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

pipeline_success_email.html.haml app/views/notify/pipeline_success_email.html.haml +2 -2

No files found.
--- a/app/views/notify/pipeline_success_email.html.haml
+++ b/app/views/notify/pipeline_success_email.html.haml
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 %html{lang: "en"}
  %head
-    %meta{content: "text/html; charset=UTF-8", "http-equiv": "Content-Type"}/
+    %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
    %meta{content: "width=device-width, initial-scale=1", name: "viewport"}/
-    %meta{content: "IE=edge", "http-equiv": "X-UA-Compatible"}/
+    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}/
    %title= message.subject
    :css
      /* CLIENT-SPECIFIC STYLES */