scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-09 22:23:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed merge

Browse source
This commit is contained in:
Zanz2 2018-09-26 12:20:13 +02:00
parent c8ed808920
commit 2e0c40ed45
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/api/v1/activities_controller.rb
View file

@ -26,7 +26,6 @@ module Api
render jsonapi: @activity, serializer: ActivitySerializer
end
<<<<<<< HEAD
def project_activities
activities = @project.activities
.page(params.dig(:page, :number))
@ -40,8 +39,6 @@ module Api
render jsonapi: @project_activity, serializer: ActivitySerializer
end
=======
>>>>>>> 2a1c3037b8d19dd4ba3a7ae599fe0d7e6c5a2e24
private
def load_team
@ -74,7 +71,6 @@ module Api
)
render jsonapi: {}, status: :not_found if @activity.nil?
end
<<<<<<< HEAD
def load_project_activity
@project_activity = @project.activities.find(
@ -82,8 +78,6 @@ module Api
)
render jsonapi: {}, status: :not_found if @project_activity.nil?
end
=======
>>>>>>> 2a1c3037b8d19dd4ba3a7ae599fe0d7e6c5a2e24
end
end
end