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

cdd2da6c

Commit cdd2da6c 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 033304a7 12ee68b4

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/educational_stages_controller.rb 4 additions, 1 deletion

app/controllers/v1/educational_stages_controller.rb
app/controllers/v1/subjects_controller.rb 4 additions, 1 deletion

app/controllers/v1/subjects_controller.rb
spec/acceptance/educational_stages_spec.rb 25 additions, 0 deletions

spec/acceptance/educational_stages_spec.rb
spec/factories/educational_stages.rb 5 additions, 0 deletions

spec/factories/educational_stages.rb

with 38 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