Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

71456575

Commit 71456575 authored 7 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'issue/281' into 'master'

SCRUM#281: changing return on pages through paginator for portalmec-admin

See merge request !458

parents 461cd2ed d3724ed6

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/paginator.rb 33 additions, 14 deletions

app/controllers/concerns/paginator.rb
app/controllers/v1/activities_controller.rb 16 additions, 0 deletions

app/controllers/v1/activities_controller.rb
app/controllers/v1/learning_objects_controller.rb 2 additions, 1 deletion

app/controllers/v1/learning_objects_controller.rb
app/controllers/v1/ratings_controller.rb 3 additions, 1 deletion

app/controllers/v1/ratings_controller.rb
app/controllers/v1/scores_controller.rb 6 additions, 1 deletion

app/controllers/v1/scores_controller.rb
app/policies/activity_policy.rb 4 additions, 0 deletions

app/policies/activity_policy.rb
app/serializers/user_serializer.rb 24 additions, 1 deletion

app/serializers/user_serializer.rb
app/services/activities_filter_service.rb 3 additions, 1 deletion

app/services/activities_filter_service.rb
config/routes.rb 1 addition, 1 deletion

config/routes.rb

with 92 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment