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

c159351a

Commit c159351a authored 9 years ago by Mauricio Giacomini Girardello

Downloads
- Plain Diff

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

parents 24e27470 793d70b3

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 2 additions, 1 deletion

Gemfile
Gemfile.lock 44 additions, 36 deletions

Gemfile.lock
app/views/learning_objects/_learning_object_horizontal.erb 1 addition, 1 deletion

app/views/learning_objects/_learning_object_horizontal.erb
app/views/learning_objects/_learning_object_vertical.erb 1 addition, 1 deletion

app/views/learning_objects/_learning_object_vertical.erb
app/views/learning_objects/show.html.erb 3 additions, 4 deletions

app/views/learning_objects/show.html.erb
config/env_vars.sh 3 additions, 0 deletions

config/env_vars.sh
test/test_helper.rb 2 additions, 0 deletions

test/test_helper.rb

with 56 additions and 43 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