From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qntdi-0002vi-Mz for garchives@archives.gentoo.org; Mon, 01 Aug 2011 14:38:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CDFE21C22C; Mon, 1 Aug 2011 14:38:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1BF3F21C22C for ; Mon, 1 Aug 2011 14:38:19 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 922D32AC015 for ; Mon, 1 Aug 2011 14:38:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2D87B3C003 for ; Mon, 1 Aug 2011 14:38:17 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: <4f32847c92654f3e8b9e8a0569872cdc1336e537.betelgeuse@gentoo> Subject: [gentoo-commits] proj/council-webapp:master commit in: / X-VCS-Repository: proj/council-webapp X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 4f32847c92654f3e8b9e8a0569872cdc1336e537 Date: Mon, 1 Aug 2011 14:38:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 554d4d4a719de16b4c6cf2ce9d9b7bff commit: 4f32847c92654f3e8b9e8a0569872cdc1336e537 Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Mon Aug 1 14:35:02 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Mon Aug 1 14:35:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/council-webap= p.git;a=3Dcommit;h=3D4f32847c Merge remote-tracking branch 'github/review' site/app/controllers/agendas_controller.rb | 2 +- site/app/controllers/approvals_controller.rb | 7 +++ site/app/controllers/voting_options_controller.rb | 8 ++-- site/app/models/agenda.rb | 32 ++++++++------= -- site/app/models/agenda_item.rb | 12 ++++++ site/app/models/approval.rb | 26 ++++++++++++ site/app/models/proxy.rb | 1 + site/app/models/user.rb | 9 +++- site/app/models/vote.rb | 3 +- site/app/models/voting_option.rb | 2 +- site/app/views/agendas/show.dryml | 16 ++++++++ site/config/hobo_routes.rb | 8 ++++ site/db/schema.rb | 21 ++++++++-- site/features/meeting_summary_approvals.feature | 28 +++++++++++++ .../meeting_summary_approvals_steps.rb | 5 ++ site/features/step_definitions/within_steps.rb | 1 + site/spec/factories.rb | 5 ++ site/spec/models/agenda_item_spec.rb | 2 +- site/spec/models/agenda_spec.rb | 41 ++++++++++++++= ++++-- site/spec/models/approval_spec.rb | 36 ++++++++++++++= +++ site/spec/models/participation_spec.rb | 4 +- site/spec/models/proxy_spec.rb | 6 +- site/spec/models/user_spec.rb | 6 +- site/spec/models/vote_spec.rb | 10 ++-- site/spec/models/voting_option_spec.rb | 4 +- site/spec/support/users_factory.rb | 15 ++++++- 26 files changed, 256 insertions(+), 54 deletions(-)