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

5e74c8dd

Commit 5e74c8dd authored 9 years ago by Marcela Ribeiro de Oliveira

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into fix-interface#2

parents a82284d8 ae81ecc2

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/stylesheets/application/feedbacks.scss 22 additions, 4 deletions

app/assets/stylesheets/application/feedbacks.scss
app/models/learning_object.rb 2 additions, 2 deletions

app/models/learning_object.rb
app/policies/collection_policy.rb 2 additions, 0 deletions

app/policies/collection_policy.rb
app/policies/followable_policy.rb 10 additions, 0 deletions

app/policies/followable_policy.rb
app/policies/learning_object_policy.rb 3 additions, 0 deletions

app/policies/learning_object_policy.rb
app/policies/reportable_policy.rb 10 additions, 0 deletions

app/policies/reportable_policy.rb
app/policies/sociable_policy.rb 18 additions, 0 deletions

app/policies/sociable_policy.rb
app/policies/user_policy.rb 2 additions, 7 deletions

app/policies/user_policy.rb
app/services/dspace/learning_object_importer.rb 2 additions, 2 deletions

app/services/dspace/learning_object_importer.rb
app/views/shared/application/_feedback.html.erb 2 additions, 2 deletions

app/views/shared/application/_feedback.html.erb
config/database.yml 1 addition, 0 deletions

config/database.yml
config/env_vars.sh 1 addition, 7 deletions

config/env_vars.sh
db/migrate/20160124145100_create_object_types.rb 7 additions, 0 deletions

db/migrate/20160124145100_create_object_types.rb
lib/tasks/portalmec.rake 3 additions, 6 deletions

lib/tasks/portalmec.rake

with 85 additions and 30 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