Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable (79ed4920) · 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
79ed4920

Commit 79ed4920 authored 13 years ago by

Felix Schäfer

Downloads
- Plain Diff

Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable

parents 6f809b82 1d5d73af

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

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

app/controllers/journals_controller.rb
app/models/issue.rb 8 additions, 1 deletion

app/models/issue.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
test/functional/repositories_filesystem_controller_test.rb 1 addition, 1 deletion

test/functional/repositories_filesystem_controller_test.rb
test/functional/search_controller_test.rb 4 additions, 3 deletions

test/functional/search_controller_test.rb
test/functional/wiki_controller_test.rb 2 additions, 2 deletions

test/functional/wiki_controller_test.rb
test/unit/lib/chili_project/database_test.rb 30 additions, 6 deletions

test/unit/lib/chili_project/database_test.rb
vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb 1 addition, 0 deletions

...or/plugins/acts_as_journalized/lib/acts_as_journalized.rb

with 160 additions and 38 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