| 1 |
commit: 2cc900875d83e616a53638dfad2a80d5565c3471 |
| 2 |
Author: Petteri Räty <petsku <AT> petteriraty <DOT> eu> |
| 3 |
AuthorDate: Tue Jul 5 10:15:05 2011 +0000 |
| 4 |
Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 10:15:05 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/council-webapp.git;a=commit;h=2cc90087 |
| 7 |
|
| 8 |
Merge remote-tracking branch 'github/bugfix' |
| 9 |
|
| 10 |
|
| 11 |
site/app/models/agenda.rb | 4 +++- |
| 12 |
site/app/models/user.rb | 3 +++ |
| 13 |
site/app/views/agenda_items/show.dryml | 10 ++++++++-- |
| 14 |
site/config/initializers/agenda.rb | 12 ------------ |
| 15 |
site/features/agenda_items.feature | 10 ++++++++++ |
| 16 |
.../features/step_definitions/agenda_item_steps.rb | 12 ++++++++++++ |
| 17 |
site/features/step_definitions/within_steps.rb | 2 +- |
| 18 |
site/public/stylesheets/application.css | 4 ++++ |
| 19 |
site/spec/models/agenda_spec.rb | 12 ++++++++++++ |
| 20 |
site/spec/models/user_spec.rb | 6 ++++++ |
| 21 |
10 files changed, 59 insertions(+), 16 deletions(-) |
Archives