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

24b0ca02

Commit 24b0ca02 authored 7 years ago by Clarissa

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into modifications

parents 916dbbc4 eeedc04f

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/followable_controller.rb 14 additions, 0 deletions

app/controllers/concerns/followable_controller.rb
app/models/search.rb 1 addition, 1 deletion

app/models/search.rb
app/serializers/follow_serializer.rb 4 additions, 1 deletion

app/serializers/follow_serializer.rb
app/services/search_service/collection.rb 1 addition, 0 deletions

app/services/search_service/collection.rb
app/services/search_service/learning_object.rb 1 addition, 0 deletions

app/services/search_service/learning_object.rb
app/services/search_service/model.rb 4 additions, 2 deletions

app/services/search_service/model.rb
app/services/search_service/user.rb 1 addition, 1 deletion

app/services/search_service/user.rb
config/routes.rb 1 addition, 0 deletions

config/routes.rb
spec/acceptance/learning_objects_spec.rb 4 additions, 0 deletions

spec/acceptance/learning_objects_spec.rb
spec/acceptance/searches_spec.rb 3 additions, 7 deletions

spec/acceptance/searches_spec.rb

with 34 additions and 12 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