Merge branch 'view-link-first' into 'master'

View link first

See merge request !1397

app/views/layouts/notify.html.haml

@@ -24,8 +24,8 @@
       %p
         \—
         %br
-        - if @project
-          You're receiving this notification because you are a member of the #{link_to_unless @target_url, @project.name_with_namespace, project_url(@project)} project team.
         - if @target_url
           #{link_to "View it on GitLab", @target_url}
           = email_action @target_url
+        - if @project
+          You're receiving this notification because you are a member of the #{link_to_unless @target_url, @project.name_with_namespace, project_url(@project)} project team.

lib/tasks/gitlab/mail_google_schema_whitelisting.rake

@@ -54,8 +54,8 @@ namespace :gitlab do
         <div class='footer' style='margin-top: 10px;'>
           <p>
           <br>
-            You're receiving this notification because you are a member of the Base / Rails Project project team.
             <a href=\"#{url}\">View it on GitLab</a>
+            You're receiving this notification because you are a member of the Base / Rails Project project team.
             #{schema}
           </p>
         </div>