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

424df10c

Commit 424df10c authored 7 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'master' into fix-import

parents 311bedcb 276e6b43

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/taggable_controller.rb 1 addition, 1 deletion

app/controllers/concerns/taggable_controller.rb
app/controllers/v1/collections_controller.rb 6 additions, 2 deletions

app/controllers/v1/collections_controller.rb
app/controllers/v1/learning_objects/chunks_controller.rb 25 additions, 11 deletions

app/controllers/v1/learning_objects/chunks_controller.rb
app/controllers/v1/learning_objects_controller.rb 6 additions, 2 deletions

app/controllers/v1/learning_objects_controller.rb
app/models/concerns/tagger.rb 5 additions, 3 deletions

app/models/concerns/tagger.rb
app/services/search_service/model.rb 6 additions, 5 deletions

app/services/search_service/model.rb

with 49 additions and 24 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