Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

app/assets/stylesheets/sections/tree.scss

@@ -28,6 +28,7 @@
       }
       td {
         border-color: #F1F1F1 !important;
+        border-bottom: 1px solid;
       }
       &:hover {
         td {

app/helpers/events_helper.rb

@@ -64,7 +64,16 @@ module EventsHelper
       project_issue_url(event.project, event.issue)
     elsif event.merge_request?
       project_merge_request_url(event.project, event.merge_request)
-
+    elsif event.note?
+      if event.note_target
+        if event.note_commit?
+          project_commit_path(event.project, event.note_commit_id, anchor: dom_id(event.target))
+        elsif event.note_project_snippet?
+          project_snippet_path(event.project, event.note_target)
+        else
+          event_note_target_path(event)
+        end
+      end
     elsif event.push?
       if event.push_with_commits?
         if event.commits_count > 1

app/views/layouts/notify.html.haml

@@ -4,6 +4,10 @@
       %title
         GitLab
   :css
+    img {
+      max-width: 100%;
+      height: auto;
+    }
     p.details {
       font-style:italic;
       color:#777

app/views/notify/project_was_moved_email.html.haml

@@ -5,7 +5,11 @@
   = link_to project_url(@project) do
     = @project.name_with_namespace
 %p
-  To update the remote url in your local repository run:
+  To update the remote url in your local repository run (for ssh):
 %p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
   git remote set-url origin #{@project.ssh_url_to_repo}
+%p
+  or for http(s):
+%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
+  git remote set-url origin #{@project.http_url_to_repo}
 %br

app/views/notify/project_was_moved_email.text.erb

@@ -4,5 +4,7 @@ The project is now located under
 <%= project_url(@project) %>
 
 
-To update the remote url in your local repository run:
+To update the remote url in your local repository run (for ssh):
   git remote set-url origin <%= @project.ssh_url_to_repo %>
+or for http(s):
+  git remote set-url origin <%= @project.http_url_to_repo %>