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

149b9677

Commit 149b9677 authored 9 years ago by Bruno Nocera Zanette

Downloads
- Plain Diff

Merge branch 'register-views-count' into dspace-solr-search

Conflicts:
	app/controllers/learning_objects_controller.rb

parents 6efa9397 e8477854

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/learning_objects_controller.rb 6 additions, 0 deletions

app/controllers/learning_objects_controller.rb
app/models/learning_object.rb 1 addition, 1 deletion

app/models/learning_object.rb
app/views/learning_objects/show.html.erb 3 additions, 1 deletion

app/views/learning_objects/show.html.erb

with 10 additions and 2 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