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

d16236dd

Commit d16236dd authored 5 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'master' into issue/392

parents 59f03ff1 66489481

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/models/collection.rb 15 additions, 0 deletions

app/models/collection.rb
app/models/learning_object.rb 14 additions, 0 deletions

app/models/learning_object.rb
app/models/user.rb 13 additions, 0 deletions

app/models/user.rb
db/migrate/20190227115926_create_join_table_language_learning_object.rb 51 additions, 4 deletions

...90227115926_create_join_table_language_learning_object.rb
lib/tasks/sanitizer.rake 30 additions, 0 deletions

lib/tasks/sanitizer.rake
spec/acceptance/collections_spec.rb 3 additions, 1 deletion

spec/acceptance/collections_spec.rb
spec/acceptance/learning_objects_spec.rb 3 additions, 1 deletion

spec/acceptance/learning_objects_spec.rb
spec/acceptance/users_spec.rb 3 additions, 1 deletion

spec/acceptance/users_spec.rb

with 132 additions and 7 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