Merge branch 'ticket/unstable/808-issue-description-diff' into unstable (f8354203) · 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
f8354203

Commit f8354203 authored 13 years ago by

Eric Davis

Downloads
- Plain Diff

Merge branch 'ticket/unstable/808-issue-description-diff' into unstable

parents 8100ce0c 38d0d530

Branches

Tags

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/journals_controller.rb 23 additions, 0 deletions

app/controllers/journals_controller.rb
app/views/journals/diff.html.erb 9 additions, 0 deletions

app/views/journals/diff.html.erb
app/views/layouts/base.rhtml 1 addition, 0 deletions

app/views/layouts/base.rhtml
config/routes.rb 2 additions, 1 deletion

config/routes.rb
public/javascripts/application.js 36 additions, 0 deletions

public/javascripts/application.js
test/functional/journals_controller_test.rb 64 additions, 0 deletions

test/functional/journals_controller_test.rb
test/integration/journals_test.rb 47 additions, 0 deletions

test/integration/journals_test.rb
test/integration/routing_test.rb 4 additions, 0 deletions

test/integration/routing_test.rb
test/integration_test_helpers.rb 1 addition, 1 deletion

test/integration_test_helpers.rb
vendor/plugins/acts_as_journalized/lib/journal_formatter.rb 14 additions, 0 deletions

vendor/plugins/acts_as_journalized/lib/journal_formatter.rb

with 201 additions and 2 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