diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-20 12:12:24 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-20 12:12:24 +0000 |
| commit | 922b738ae529ef9730aac47450026be9544cd283 (patch) | |
| tree | b73d2aa2b23a5269b3ffafe77ff639c8e7f4fb8d | |
| parent | 825adf461bafd82193da38bcba5583454c7e8eef (diff) | |
| parent | 682c0deffe4e1849a2dd5bd61d90aa08e4209681 (diff) | |
| download | gitlab-ce-922b738ae529ef9730aac47450026be9544cd283.tar.gz | |
Merge branch 'remove-redundant-last-push' into 'master'
Remove redundant last push event if activity feed is set to main page
### What does this MR do?
This MR eliminates a redundant last push event message if the user's preferences are set to the main activity feed.
### Why was this MR needed?
Lots of wasted space was introduced as a result.
### Screenshots
#### Before
#### After
### What are the relevant issue numbers?
Closes #2009
See merge request !995
| -rw-r--r-- | app/views/projects/show.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index b90cadfb1e2..769dd68f089 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -6,7 +6,9 @@ = render 'shared/no_ssh' = render 'shared/no_password' -= render 'projects/last_push' +- if prefer_readme? + = render 'projects/last_push' + = render "home_panel" .project-stats |