diff options
Diffstat (limited to 'app/views/events')
-rw-r--r-- | app/views/events/_commit.html.haml | 5 | ||||
-rw-r--r-- | app/views/events/_event.html.haml | 16 | ||||
-rw-r--r-- | app/views/events/_event_issue.atom.haml | 3 | ||||
-rw-r--r-- | app/views/events/_event_last_push.html.haml | 14 | ||||
-rw-r--r-- | app/views/events/_event_merge_request.atom.haml | 3 | ||||
-rw-r--r-- | app/views/events/_event_note.atom.haml | 2 | ||||
-rw-r--r-- | app/views/events/_event_push.atom.haml | 14 | ||||
-rw-r--r-- | app/views/events/_events.html.haml | 1 | ||||
-rw-r--r-- | app/views/events/event/_common.html.haml | 18 | ||||
-rw-r--r-- | app/views/events/event/_created_project.html.haml | 27 | ||||
-rw-r--r-- | app/views/events/event/_note.html.haml | 26 | ||||
-rw-r--r-- | app/views/events/event/_push.html.haml | 31 |
12 files changed, 0 insertions, 160 deletions
diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml deleted file mode 100644 index c86ce9ae651..00000000000 --- a/app/views/events/_commit.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -%li.commit - .commit-row-title - = link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: '' - - = gfm event_commit_title(commit[:message]), project diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml deleted file mode 100644 index 02b1dec753c..00000000000 --- a/app/views/events/_event.html.haml +++ /dev/null @@ -1,16 +0,0 @@ -- if event.proper? - .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"} - .event-item-timestamp - #{time_ago_with_tooltip(event.created_at)} - - = cache [event, current_user] do - = image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:'' - - - if event.push? - = render "events/event/push", event: event - - elsif event.commented? - = render "events/event/note", event: event - - elsif event.created_project? - = render "events/event/created_project", event: event - - else - = render "events/event/common", event: event
\ No newline at end of file diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml deleted file mode 100644 index 0edb61ea246..00000000000 --- a/app/views/events/_event_issue.atom.haml +++ /dev/null @@ -1,3 +0,0 @@ -%div{xmlns: "http://www.w3.org/1999/xhtml"} - - if issue.description.present? - = markdown(issue.description, xhtml: true) diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml deleted file mode 100644 index d2f0005142a..00000000000 --- a/app/views/events/_event_last_push.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -- if show_last_push_widget?(event) - .event-last-push - .event-last-push-text - %span You pushed to - = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do - %strong= event.ref_name - at - %strong= link_to_project event.project - #{time_ago_with_tooltip(event.created_at)} - - .pull-right - = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-sm" do - Create Merge Request - %hr diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml deleted file mode 100644 index 1a8b62abeab..00000000000 --- a/app/views/events/_event_merge_request.atom.haml +++ /dev/null @@ -1,3 +0,0 @@ -%div{xmlns: "http://www.w3.org/1999/xhtml"} - - if merge_request.description.present? - = markdown(merge_request.description, xhtml: true) diff --git a/app/views/events/_event_note.atom.haml b/app/views/events/_event_note.atom.haml deleted file mode 100644 index b49c331ccf2..00000000000 --- a/app/views/events/_event_note.atom.haml +++ /dev/null @@ -1,2 +0,0 @@ -%div{xmlns: "http://www.w3.org/1999/xhtml"} - = markdown(note.note, xhtml: true) diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml deleted file mode 100644 index 5d14def8f75..00000000000 --- a/app/views/events/_event_push.atom.haml +++ /dev/null @@ -1,14 +0,0 @@ -%div{xmlns: "http://www.w3.org/1999/xhtml"} - - event.commits.first(15).each do |commit| - %p - %strong= commit[:author][:name] - = link_to "(##{truncate_sha(commit[:id])})", namespace_project_commit_path(event.project.namespace, event.project, id: commit[:id]) - %i - at - = commit[:timestamp].to_time.to_s(:short) - %blockquote= markdown(escape_once(commit[:message]), xhtml: true) - - if event.commits_count > 15 - %p - %i - \... and - = pluralize(event.commits_count - 15, "more commit") diff --git a/app/views/events/_events.html.haml b/app/views/events/_events.html.haml deleted file mode 100644 index 68c19df092d..00000000000 --- a/app/views/events/_events.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render partial: 'events/event', collection: @events diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml deleted file mode 100644 index a39e62e9dac..00000000000 --- a/app/views/events/event/_common.html.haml +++ /dev/null @@ -1,18 +0,0 @@ -.event-title - %span.author_name= link_to_author event - %span.event_label{class: event.action_name} - = event_action_name(event) - - - if event.target - %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target] - at - - - if event.project - = link_to_project event.project - - else - = event.project_name - -- if event.target.respond_to?(:title) - .event-body - .event-note - = event.target.title diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml deleted file mode 100644 index 552525f4a07..00000000000 --- a/app/views/events/event/_created_project.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -.event-title - %span.author_name= link_to_author event - %span.event_label{class: event.action_name} - = event_action_name(event) - - - if event.project - = link_to_project event.project - - else - = event.project_name - -- if current_user == event.author && !event.project.private? && twitter_sharing_enabled? - .event-body - .event-note - .md - %p - Congratulations! Why not share your accomplishment with the world? - - %a.twitter-share-button{ | - href: "https://twitter.com/share", | - "data-url" => event.project.web_url, | - "data-text" => "I just #{event.project.imported? ? "imported" : "created"} a new project in GitLab! GitLab is version control on your server.", | - "data-size" => "medium", | - "data-related" => "gitlab", | - "data-hashtags" => "gitlab", | - "data-count" => "none"} - Tweet - %script{src: "//platform.twitter.com/widgets.js"} diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml deleted file mode 100644 index 4ef18c09060..00000000000 --- a/app/views/events/event/_note.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -.event-title - %span.author_name= link_to_author event - %span.event_label - = event.action_name - = event_note_title_html(event) - at - - - if event.project - = link_to_project event.project - - else - = event.project_name - -.event-body - .event-note - .md - %i.fa.fa-comment-o.event-note-icon - = event_note(event.target.note) - - note = event.target - - if note.attachment.url - - if note.attachment.image? - = link_to note.attachment.url, target: '_blank' do - = image_tag note.attachment.url, class: 'note-image-attach' - - else - = link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do - %i.fa.fa-paperclip - = note.attachment_identifier diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml deleted file mode 100644 index 60d7978b13f..00000000000 --- a/app/views/events/event/_push.html.haml +++ /dev/null @@ -1,31 +0,0 @@ -.event-title - %span.author_name= link_to_author event - %span.event_label.pushed #{event.action_name} #{event.ref_type} - - if event.rm_ref? - %strong= event.ref_name - - else - = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do - %strong= event.ref_name - at - = link_to_project event.project - -- if event.push_with_commits? - - project = event.project - .event-body - %ul.well-list.event_commits - - few_commits = event.commits[0...2] - - few_commits.each do |commit| - = render "events/commit", commit: commit, project: project - - - if event.commits_count > 1 - %li.commits-stat - - if event.commits_count > 2 - %span ... and #{event.commits_count - 2} more commits. - - if event.md_ref? - - from = event.commit_from - - from_label = truncate_sha(from) - - else - - from = event.project.default_branch - - from_label = from - = link_to namespace_project_compare_path(event.project.namespace, event.project, from: from, to: event.commit_to) do - %strong Compare → #{from_label}...#{truncate_sha(event.commit_to)} |