Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
bd7ba9c5
Commit
bd7ba9c5
authored
Jan 28, 2019
by
Riccardo Padovani
Committed by
Phil Hughes
Jan 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix `star` action in the `explore` subpages
parent
49c12f9b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
app/assets/javascripts/pages/explore/projects/index.js
app/assets/javascripts/pages/explore/projects/index.js
+5
-1
app/controllers/explore/projects_controller.rb
app/controllers/explore/projects_controller.rb
+3
-3
No files found.
app/assets/javascripts/pages/explore/projects/index.js
View file @
bd7ba9c5
import
ProjectsList
from
'
~/projects_list
'
;
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
View file @
bd7ba9c5
...
@@ -15,7 +15,7 @@ class Explore::ProjectsController < Explore::ApplicationController
...
@@ -15,7 +15,7 @@ class Explore::ProjectsController < Explore::ApplicationController
format
.
html
format
.
html
format
.
json
do
format
.
json
do
render
json:
{
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
end
end
...
@@ -30,7 +30,7 @@ class Explore::ProjectsController < Explore::ApplicationController
...
@@ -30,7 +30,7 @@ class Explore::ProjectsController < Explore::ApplicationController
format
.
html
format
.
html
format
.
json
do
format
.
json
do
render
json:
{
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
end
end
...
@@ -44,7 +44,7 @@ class Explore::ProjectsController < Explore::ApplicationController
...
@@ -44,7 +44,7 @@ class Explore::ProjectsController < Explore::ApplicationController
format
.
html
format
.
html
format
.
json
do
format
.
json
do
render
json:
{
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
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment