Add starring date to overview of starrers

5 files changed, 31 insertions, 17 deletions

diff --git a/app/assets/stylesheets/pages/users.scss b/app/assets/stylesheets/pages/users.scss
index d3acf9a1c48..3b018c1e087 100644
--- a/app/assets/stylesheets/pages/users.scss
+++ b/app/assets/stylesheets/pages/users.scss
@@ -95,7 +95,11 @@
   }
 }
 
-.card-body .user {
-  color: $gl-text-color;
-  font-weight: $gl-font-weight-bold;
+.card-body .user-info {
+  float: left;
+
+  .user {
+    color: $gl-text-color;
+    font-weight: $gl-font-weight-bold;
+  }
 }
diff --git a/app/controllers/projects/starrers_controller.rb b/app/controllers/projects/starrers_controller.rb
index 8d5ddd51e4c..5939a3885c6 100644
--- a/app/controllers/projects/starrers_controller.rb
+++ b/app/controllers/projects/starrers_controller.rb
@@ -2,16 +2,19 @@
 
 class Projects::StarrersController < Projects::ApplicationController
   include SortingHelper
-  #
+
   # Authorize
   before_action :require_non_empty_project
 
+  # rubocop: disable CodeReuse/ActiveRecord
   def index
     @sort = params[:sort].presence || sort_value_name
 
     params[:has_starred] = @project
 
     @starrers = UsersFinder.new(current_user, params).execute
+    @starrers = @starrers.joins(:users_star_projects).select('"users".*, "users_star_projects"."created_at" as "starred_since"')
     @starrers = @starrers.sort_by_attribute(@sort)
   end
+  # rubocop: enable CodeReuse/ActiveRecord
 end
diff --git a/app/views/projects/starrers/_starrer.html.haml b/app/views/projects/starrers/_starrer.html.haml
new file mode 100644
index 00000000000..d8eee17dff4
--- /dev/null
+++ b/app/views/projects/starrers/_starrer.html.haml
@@ -0,0 +1,19 @@
+- user = local_assigns.fetch(:user)
+
+.col-lg-3.col-md-4.col-sm-12
+  .card
+    .card-body
+      = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: ''
+
+      .user-info
+        .block-truncated
+          = link_to user.name, user_path(user), class: 'user js-user-link', data: { user_id: user.id }
+
+        .block-truncated
+          %span.cgray= user.to_reference
+
+          - if user == current_user
+            %span.badge.badge-success.prepend-left-5= _("It's you")
+
+        .block-truncated
+          = time_ago_with_tooltip(user.starred_since)
diff --git a/app/views/projects/starrers/index.html.haml b/app/views/projects/starrers/index.html.haml
index 729b0ca2eb0..7f7e0a93f14 100644
--- a/app/views/projects/starrers/index.html.haml
+++ b/app/views/projects/starrers/index.html.haml
@@ -22,4 +22,4 @@
                   = link_to filter_user_path(sort: value), class: ("is-active" if @sort == value) do
                     = title
 .row.prepend-top-10
-  = render partial: 'shared/users/usercell', collection: @starrers, as: :user
+  = render partial: 'starrer', collection: @starrers, as: :user
diff --git a/app/views/shared/users/_usercell.html.haml b/app/views/shared/users/_usercell.html.haml
deleted file mode 100644
index 93eaa282b23..00000000000
--- a/app/views/shared/users/_usercell.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-- user = local_assigns.fetch(:user)
-
-.col-lg-3.col-md-4.col-sm-12
-  .card
-    .card-body
-      = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: ''
-      .block-truncated
-        = link_to user.name, user_path(user), class: 'user js-user-link', data: { user_id: user.id }
-      %span.cgray= user.to_reference
-
-      - if user == current_user
-        %span.badge.badge-success.prepend-left-5= _("It's you")