diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-01 15:58:09 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-01 15:58:09 +0300 |
| commit | 57f1ff5dc03dfd6b9c46a84acb4697b6c3928a14 (patch) | |
| tree | a49a1e82ee6563c92e2c194c26dbf3277b7f2e3b /app | |
| parent | 0ab708dfa6f312e4a29abd23c66dbd78a8b23aee (diff) | |
| parent | b88401c9aabd30943ed62acfba78297686b87b5a (diff) | |
| download | gitlab-ce-57f1ff5dc03dfd6b9c46a84acb4697b6c3928a14.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/tree.scss | 1 | ||||
| -rw-r--r-- | app/helpers/events_helper.rb | 11 | ||||
| -rw-r--r-- | app/views/layouts/notify.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notify/project_was_moved_email.html.haml | 6 | ||||
| -rw-r--r-- | app/views/notify/project_was_moved_email.text.erb | 4 |
5 files changed, 23 insertions, 3 deletions
diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index b08f94f55a0..678a6cd716d 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 f0530c74828..91c18ff8f95 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 991d4f0c6d8..ab421d63f1a 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 3e761c43435..1667c59bc07 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 7889c7b9cc4..664148fb3ba 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 %> |