| 1 |
commit: 4f32847c92654f3e8b9e8a0569872cdc1336e537 |
| 2 |
Author: Petteri Räty <petsku <AT> petteriraty <DOT> eu> |
| 3 |
AuthorDate: Mon Aug 1 14:35:02 2011 +0000 |
| 4 |
Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 1 14:35:02 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/council-webapp.git;a=commit;h=4f32847c |
| 7 |
|
| 8 |
Merge remote-tracking branch 'github/review' |
| 9 |
|
| 10 |
|
| 11 |
site/app/controllers/agendas_controller.rb | 2 +- |
| 12 |
site/app/controllers/approvals_controller.rb | 7 +++ |
| 13 |
site/app/controllers/voting_options_controller.rb | 8 ++-- |
| 14 |
site/app/models/agenda.rb | 32 ++++++++-------- |
| 15 |
site/app/models/agenda_item.rb | 12 ++++++ |
| 16 |
site/app/models/approval.rb | 26 ++++++++++++ |
| 17 |
site/app/models/proxy.rb | 1 + |
| 18 |
site/app/models/user.rb | 9 +++- |
| 19 |
site/app/models/vote.rb | 3 +- |
| 20 |
site/app/models/voting_option.rb | 2 +- |
| 21 |
site/app/views/agendas/show.dryml | 16 ++++++++ |
| 22 |
site/config/hobo_routes.rb | 8 ++++ |
| 23 |
site/db/schema.rb | 21 ++++++++-- |
| 24 |
site/features/meeting_summary_approvals.feature | 28 +++++++++++++ |
| 25 |
.../meeting_summary_approvals_steps.rb | 5 ++ |
| 26 |
site/features/step_definitions/within_steps.rb | 1 + |
| 27 |
site/spec/factories.rb | 5 ++ |
| 28 |
site/spec/models/agenda_item_spec.rb | 2 +- |
| 29 |
site/spec/models/agenda_spec.rb | 41 ++++++++++++++++++-- |
| 30 |
site/spec/models/approval_spec.rb | 36 +++++++++++++++++ |
| 31 |
site/spec/models/participation_spec.rb | 4 +- |
| 32 |
site/spec/models/proxy_spec.rb | 6 +- |
| 33 |
site/spec/models/user_spec.rb | 6 +- |
| 34 |
site/spec/models/vote_spec.rb | 10 ++-- |
| 35 |
site/spec/models/voting_option_spec.rb | 4 +- |
| 36 |
site/spec/support/users_factory.rb | 15 ++++++- |
| 37 |
26 files changed, 256 insertions(+), 54 deletions(-) |
Archives