5 2 stable (!10370) · Merge requests · gpt / large_projects / gitlabhq1 · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Closed gitlab-qa-bot requested to merge 5-2-stable into master 8 years ago

Viewing commit e414ba2f

Show latest version

1 file

+ 1

− 1

e414ba2f

Do not render project events since we render them again via ajax request · e414ba2f
Dmitriy Zaporozhets authored 11 years ago

Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.

app/views/projects/show.html.haml

+ 1

− 1

@@ -3,7 +3,7 @@
.row
  .span9
    = render "events/event_last_push", event: @last_push
    .content_list= render @events
    .content_list
    .loading.hide
  .span3
    .light-well