Commit cb9f418b authored by Fatih Acet's avatar Fatih Acet

Merge branch 'hide-project-name-in-project-activities' into 'master'

Hide project name in project activities

## What does this MR do?

- hide namespace and project name on project activity page

## Are there points in the code the reviewer needs to double check?

- did `.event_label` have any meaning?

## Why was this MR needed?

- all events on project activity page are from the same project, so the information was redundant

## What are the relevant issue numbers?

closes #18963

## Screenshots

### Before

![events-before](/uploads/76336e3f5cb08d4ef984df73c89aa90f/events-before.png)

### After

![events-after](/uploads/4a10718ed32960efc115d7854e5cad68/events-after.png)

![after-john-activity](/uploads/d9d151a829d8d32136525e8eb7ea04ad/after-john-activity.png)


See merge request !5068
parents caefed27 fa079e38
...@@ -105,6 +105,7 @@ v 8.10.0 (unreleased) ...@@ -105,6 +105,7 @@ v 8.10.0 (unreleased)
- ObjectRenderer retrieve renderer content using Rails.cache.read_multi - ObjectRenderer retrieve renderer content using Rails.cache.read_multi
- Better caching of git calls on ProjectsController#show. - Better caching of git calls on ProjectsController#show.
- Avoid to retrieve MR closes_issues as much as possible. - Avoid to retrieve MR closes_issues as much as possible.
- Hide project name in project activities !5068 (winniehell)
- Add API endpoint for a group issues !4520 (mahcsig) - Add API endpoint for a group issues !4520 (mahcsig)
- Add Bugzilla integration !4930 (iamtjg) - Add Bugzilla integration !4930 (iamtjg)
- Fix new snippet style bug (elliotec) - Fix new snippet style bug (elliotec)
......
...@@ -176,3 +176,11 @@ ...@@ -176,3 +176,11 @@
} }
} }
} }
// hide event scope (namespace + project) where it is not necessary
.project-activity {
.event-scope {
display: none;
}
}
%span.event-scope
= event_preposition(event)
- if event.project
= link_to_project event.project
- else
= event.project_name
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
%span.event_label{class: event.action_name} %span{class: event.action_name}
- if event.target - if event.target
= event.action_name = event.action_name
%strong %strong
...@@ -10,12 +10,7 @@ ...@@ -10,12 +10,7 @@
- else - else
= event_action_name(event) = event_action_name(event)
= event_preposition(event) = render "events/event_scope", event: event
- if event.project
= link_to_project event.project
- else
= event.project_name
- if event.target.respond_to?(:title) - if event.target.respond_to?(:title)
.event-body .event-body
......
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
%span.event_label{class: event.action_name} %span{class: event.action_name}
= event_action_name(event) = event_action_name(event)
- if event.project - if event.project
......
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
%span.event_label
= event.action_name = event.action_name
= event_note_title_html(event) = event_note_title_html(event)
at
- if event.project = render "events/event_scope", event: event
= link_to_project event.project
- else
= event.project_name
.event-body .event-body
.event-note .event-note
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
.event-title .event-title
%span.author_name= link_to_author event %span.author_name= link_to_author event
%span.event_label.pushed #{event.action_name} #{event.ref_type} %span.pushed #{event.action_name} #{event.ref_type}
- if event.rm_ref? - if event.rm_ref?
%strong= event.ref_name %strong= event.ref_name
- else - else
%strong %strong
= link_to event.ref_name, namespace_project_commits_path(project.namespace, project, event.ref_name), title: h(event.target_title) = link_to event.ref_name, namespace_project_commits_path(project.namespace, project, event.ref_name), title: h(event.target_title)
at
= link_to_project project = render "events/event_scope", event: event
- if event.push_with_commits? - if event.push_with_commits?
.event-body .event-body
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
%i.fa.fa-rss %i.fa.fa-rss
= render 'shared/event_filter' = render 'shared/event_filter'
.content_list{:"data-href" => activity_project_path(@project)}
.content_list.project-activity{:"data-href" => activity_project_path(@project)}
= spinner = spinner
:javascript :javascript
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment