Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 8 deletions

diff --git a/app/views/projects/buttons/_star.html.haml b/app/views/projects/buttons/_star.html.haml
index f607a21ad21..eaf906ad89f 100644
--- a/app/views/projects/buttons/_star.html.haml
+++ b/app/views/projects/buttons/_star.html.haml
@@ -1,15 +1,13 @@
 - if current_user
+  - starred = current_user.starred?(@project)
+  - icon = starred ? 'star' : 'star-o'
+  - button_text =  starred ? s_('ProjectOverview|Unstar') : s_('ProjectOverview|Star')
+  - button_text_classes = starred ? 'starred' : ''
   .count-badge.d-inline-flex.align-item-stretch.gl-mr-3.btn-group
-    %button.gl-button.btn.btn-default.btn-sm.star-btn.toggle-star{ type: "button", data: { endpoint: toggle_star_project_path(@project, :json) } }
-      - if current_user.starred?(@project)
-        = sprite_icon('star', css_class: 'icon')
-        %span.starred= s_('ProjectOverview|Unstar')
-      - else
-        = sprite_icon('star-o', css_class: 'icon')
-        %span= s_('ProjectOverview|Star')
+    = render Pajamas::ButtonComponent.new(size: :small, icon: icon, button_text_classes: button_text_classes, button_options: { class: 'star-btn toggle-star', data: { endpoint: toggle_star_project_path(@project, :json) } }) do
+      - button_text
     = link_to project_starrers_path(@project), title: n_(s_('ProjectOverview|Starrer'), s_('ProjectOverview|Starrers'), @project.star_count), class: 'gl-button btn btn-default btn-sm has-tooltip star-count count' do
       = @project.star_count
-
 - else
   .count-badge.d-inline-flex.align-item-stretch.gl-mr-3.btn-group
     = link_to new_user_session_path, class: 'gl-button btn btn-default btn-sm has-tooltip star-btn', title: s_('ProjectOverview|You must sign in to star a project') do