Merge branch 'ticket/unstable/406-journals-controller-aaj' into unstable (c83c1d9a) · Commits · Projects / OHR Support · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

OHR Support
- Activity
- Members
- Labels
- Releases
- Incidents
- Service Desk

Snippets Groups Projects

Projects
OHR Support
Commits
c83c1d9a

Commit c83c1d9a authored 13 years ago by

Eric Davis

Downloads
- Plain Diff

Merge branch 'ticket/unstable/406-journals-controller-aaj' into unstable

parents c04ff93f 8994a0b5

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/journals_controller.rb 76 additions, 15 deletions

app/controllers/journals_controller.rb
app/views/journals/_notes_form.rhtml 10 additions, 0 deletions

app/views/journals/_notes_form.rhtml
app/views/journals/diff.html.erb 0 additions, 10 deletions

app/views/journals/diff.html.erb
test/functional/journals_controller_test.rb 28 additions, 0 deletions

test/functional/journals_controller_test.rb

with 114 additions and 25 deletions

0% 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