Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/pages/explore/projects/index.js

 import ProjectsList from '~/projects_list';
+import Star from '../../../star';
 
-document.addEventListener('DOMContentLoaded', () => new ProjectsList());
+document.addEventListener('DOMContentLoaded', () => {
+  new ProjectsList(); // eslint-disable-line no-new
+  new Star('.project-row'); // eslint-disable-line no-new
+});

app/controllers/explore/projects_controller.rb

@@ -15,7 +15,7 @@ class Explore::ProjectsController < Explore::ApplicationController
       format.html
       format.json do
         render json: {
-          html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
+          html: view_to_html_string("explore/projects/_projects", locals: { projects: @projects })
         }
       end
     end
@@ -30,7 +30,7 @@ class Explore::ProjectsController < Explore::ApplicationController
       format.html
       format.json do
         render json: {
-          html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
+          html: view_to_html_string("explore/projects/_projects", locals: { projects: @projects })
         }
       end
     end
@@ -44,7 +44,7 @@ class Explore::ProjectsController < Explore::ApplicationController
       format.html
       format.json do
         render json: {
-          html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
+          html: view_to_html_string("explore/projects/_projects", locals: { projects: @projects })
         }
       end
     end