Add latest changes from gitlab-org/gitlab@master

5 files changed, 19 insertions, 1 deletions

diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 647f0597adb..c042cd2c3e3 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -5,7 +5,9 @@
     .event-item-timestamp
       #{time_ago_with_tooltip(event.created_at)}
 
-    - if event.created_project_action?
+    - if event.wiki_page?
+      = render "events/event/wiki", event: event
+    - elsif event.created_project_action?
       = render "events/event/created_project", event: event
     - elsif event.push_action?
       = render "events/event/push", event: event
diff --git a/app/views/events/event/_wiki.html.haml b/app/views/events/event/_wiki.html.haml
new file mode 100644
index 00000000000..7ca98294521
--- /dev/null
+++ b/app/views/events/event/_wiki.html.haml
@@ -0,0 +1,10 @@
+= icon_for_profile_event(event)
+
+= event_user_info(event)
+
+.event-title.d-flex.flex-wrap
+  = inline_event_icon(event)
+  %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
+    = event.action_name
+  = event_wiki_title_html(event)
+  = render "events/event_scope", event: event
diff --git a/app/views/groups/registry/repositories/index.html.haml b/app/views/groups/registry/repositories/index.html.haml
index eff8d77ac72..996582e0ae8 100644
--- a/app/views/groups/registry/repositories/index.html.haml
+++ b/app/views/groups/registry/repositories/index.html.haml
@@ -12,6 +12,8 @@
           "no_containers_image" => image_path('illustrations/docker-empty-state.svg'),
           "containers_error_image" => image_path('illustrations/docker-error-state.svg'),
           "registry_host_url_with_port" => escape_once(registry_config.host_port),
+          "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
+          "is_admin": current_user&.admin,
           is_group_page: true,
           character_error: @character_error.to_s } }
       - else
diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml
index 810830fd0c4..80dd5eaecb2 100644
--- a/app/views/projects/registry/repositories/index.html.haml
+++ b/app/views/projects/registry/repositories/index.html.haml
@@ -16,6 +16,8 @@
           "repository_url" => escape_once(@project.container_registry_url),
           "registry_host_url_with_port" => escape_once(registry_config.host_port),
           "expiration_policy_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'expiration-policy'),
+          "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
+          "is_admin": current_user&.admin,
           character_error: @character_error.to_s } }
       - else
         #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json),
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml
index ad9eb325ff0..1b2e8d3799d 100644
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
@@ -15,4 +15,6 @@
       = render_if_exists 'events/epics_filter'
     - if comments_visible?
       = event_filter_link EventFilter::COMMENTS, _('Comments'), s_('EventFilterBy|Filter by comments')
+    - if Feature.enabled?(:wiki_events) && (@project.nil? || @project.has_wiki?)
+      = event_filter_link EventFilter::WIKI, _('Wiki'), s_('EventFilterBy|Filter by wiki')
     = event_filter_link EventFilter::TEAM, _('Team'), s_('EventFilterBy|Filter by team')