Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'production'

  • Loading branch information...
commit d81169b06d3fa3f6bb7d97fa9b74edf64bf97863 2 parents d08c453 + 7df8602
@aross aross authored
View
7 Gemfile
@@ -21,7 +21,8 @@ gem 'delayed_job', '~> 2.1'
# RMagick
gem 'rmagick', '2.13.1'
-gem 'galetahub-simple_captcha' #, :git => 'https://github.com/galetahub/simple-captcha.git'
+gem "galetahub-simple_captcha", :require => "simple_captcha"
+#gem 'simple_captcha'# , :git => 'git://github.com/galetahub/simple-captcha.git'
# Image uploads
gem 'carrierwave'
@@ -82,11 +83,11 @@ gem 'will_paginate', '~> 3.0.pre2'
gem "validates_captcha"
gem "okkez-open_id_authentication"
-gem "acts-as-taggable-on", :git => 'http://github.com/mbleigh/acts-as-taggable-on.git'
+gem "acts-as-taggable-on", :git => 'git://github.com/mbleigh/acts-as-taggable-on.git'
gem 'mechanize'
#gem 'formageddon', '0.0.0', :require => 'formageddon', :path => '/Users/aross/Sites/formageddon'
-gem 'formageddon', :git => 'http://github.com/opencongress/formageddon.git'
+gem 'formageddon', :git => 'git://github.com/opencongress/formageddon.git'
group :test, :development do
View
6 Gemfile.lock
@@ -1,12 +1,12 @@
GIT
- remote: http://github.com/mbleigh/acts-as-taggable-on.git
- revision: 62f5fea1e19e4520a7bc8b65e0207aea11d4927f
+ remote: git://github.com/mbleigh/acts-as-taggable-on.git
+ revision: 9563d799110ee8d798f2b5cfe21d8fdb3ca534fb
specs:
acts-as-taggable-on (2.3.3)
rails (~> 3.0)
GIT
- remote: http://github.com/opencongress/formageddon.git
+ remote: git://github.com/opencongress/formageddon.git
revision: 753b862a593b472f47b00af2eef13e460a7eb4c8
specs:
formageddon (0.0.0)
View
8 app/views/bill/_topic.html.erb
@@ -27,9 +27,11 @@
</div>
<!-- <div class="box-wrap">
-
- <span class="first"><strong><%= link_to "Latest Action", :action => 'actions_votes' %></strong> <%= @bill.actions[0].formatted_date_short %></span> -
- <span><strong><%= link_to "Amendments", :action => 'actions_votes' %></strong> <%= @bill.amendments.size %></span> -
+
+ <% unless @bill.actions.empty? %>
+ <span class="first"><strong><%= link_to "Latest Action", :action => 'actions_votes' %></strong> <%= @bill.actions[0].formatted_date_short %></span> -
+ <% end %>
+ <span><strong><%= link_to "Amendments", :action => 'actions_votes' %></strong> <%= @bill.amendments.size %></span> -
<span><strong><%= link_to "Votes", :action => 'actions_votes' %></strong> <%= @bill.roll_calls.size %></span>
</div> -->
View
BIN  public/images/oc-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.