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

d6a0ec69

Commit d6a0ec69 authored 9 years ago by Matheus Agio Nerone

Downloads
- Plain Diff

Merge branch 'master' into bugfix-learning-object-show-view

parents 58879589 dde4d3d2

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 8 additions, 0 deletions

Gemfile
app/controllers/chunks_controller.rb 3 additions, 1 deletion

app/controllers/chunks_controller.rb
app/controllers/collections_controller.rb 7 additions, 7 deletions

app/controllers/collections_controller.rb
app/controllers/learning_objects_controller.rb 1 addition, 1 deletion

app/controllers/learning_objects_controller.rb
app/models/collection.rb 5 additions, 0 deletions

app/models/collection.rb
app/views/learning_objects/show.html.erb 91 additions, 84 deletions

app/views/learning_objects/show.html.erb

with 115 additions and 93 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