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

2b60f0d4

Commit 2b60f0d4 authored 8 years ago by Marcela Ribeiro de Oliveira

Downloads
- Plain Diff

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

parents 37b04717 80b891c6

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/concerns/sociable_controller.rb 5 additions, 13 deletions

app/controllers/concerns/sociable_controller.rb
app/policies/sociable_policy.rb 0 additions, 4 deletions

app/policies/sociable_policy.rb
config/routes.rb 1 addition, 2 deletions

config/routes.rb
spec/acceptance/collections_spec.rb 2 additions, 2 deletions

spec/acceptance/collections_spec.rb
spec/acceptance/learning_objects_spec.rb 3 additions, 3 deletions

spec/acceptance/learning_objects_spec.rb
spec/acceptance/users_spec.rb 93 additions, 0 deletions

spec/acceptance/users_spec.rb

with 104 additions and 24 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