diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index b08f94f55a047edfa23697f01979faad106cb0ca..678a6cd716da8d16fce59b8b11f983580787b3ff 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -28,6 +28,7 @@ } td { border-color: #F1F1F1 !important; + border-bottom: 1px solid; } &:hover { td { diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index f0530c748282480c0020ed3ee91f218d0e4a0977..91c18ff8f956c9e4dd67c5eb6d825a9f9cc71af0 100644 --- a/app/helpers/events_helper.rb +++ b/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 diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 991d4f0c6d8d09a2541b1fa62d68385ddc6b5591..ab421d63f1af85e445384102b15ff95890e3d2aa 100644 --- a/app/views/layouts/notify.html.haml +++ b/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 diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml index 3e761c43435df748eb04c18e7e57222e5c5dcddf..1667c59bc072baaab27cf205b295c1d9969095d9 100644 --- a/app/views/notify/project_was_moved_email.html.haml +++ b/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 diff --git a/app/views/notify/project_was_moved_email.text.erb b/app/views/notify/project_was_moved_email.text.erb index 7889c7b9cc4297a32f2d47a93e3ea7660ca630f5..664148fb3ba3f007573d4d60876563f52449579c 100644 --- a/app/views/notify/project_was_moved_email.text.erb +++ b/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 %>