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 1Qe7Fe-0008B3-Fj for garchives@archives.gentoo.org; Tue, 05 Jul 2011 15:09:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7972521C12A; Tue, 5 Jul 2011 15:09:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4DE3621C127 for ; Tue, 5 Jul 2011 15:09: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 C492E1B4018 for ; Tue, 5 Jul 2011 15:09:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E93FA8003D for ; Tue, 5 Jul 2011 15:09: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: <2cc900875d83e616a53638dfad2a80d5565c3471.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: 2cc900875d83e616a53638dfad2a80d5565c3471 Date: Tue, 5 Jul 2011 15:09: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: 8d077f3ab2863b9ab26b51816b84894f commit: 2cc900875d83e616a53638dfad2a80d5565c3471 Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Tue Jul 5 10:15:05 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Tue Jul 5 10:15:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/council-webap= p.git;a=3Dcommit;h=3D2cc90087 Merge remote-tracking branch 'github/bugfix' site/app/models/agenda.rb | 4 +++- site/app/models/user.rb | 3 +++ site/app/views/agenda_items/show.dryml | 10 ++++++++-- site/config/initializers/agenda.rb | 12 ------------ site/features/agenda_items.feature | 10 ++++++++++ .../features/step_definitions/agenda_item_steps.rb | 12 ++++++++++++ site/features/step_definitions/within_steps.rb | 2 +- site/public/stylesheets/application.css | 4 ++++ site/spec/models/agenda_spec.rb | 12 ++++++++++++ site/spec/models/user_spec.rb | 6 ++++++ 10 files changed, 59 insertions(+), 16 deletions(-)