Skip to content

Commit

Permalink
fix bundling issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dougcole committed Apr 26, 2012
1 parent de5f360 commit 3e82b0e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -65,7 +65,7 @@ gem "json"
gem "nokogiri"

# spam protection
gem "defender", :git => 'git://github.com/kennethlmartin/defender.git'
gem "defender"

group :deployment do
gem 'capistrano'
Expand All @@ -84,7 +84,7 @@ gem 'will_paginate', '~> 3.0.pre2'
gem "validates_captcha"
gem "okkez-open_id_authentication"

gem "acts-as-taggable-on", :git => 'git://github.com/dougcole/acts-as-taggable-on.git', :branch => 'use_equality_where_possible'
gem "acts-as-taggable-on", :git => 'https://github.com/mbleigh/acts-as-taggable-on.git'

gem 'mechanize'
#gem 'formageddon', '0.0.0', :require => 'formageddon', :path => '/Users/aross/Sites/formageddon'
Expand Down
28 changes: 11 additions & 17 deletions Gemfile.lock
@@ -1,25 +1,9 @@
GIT
remote: git://github.com/dougcole/acts-as-taggable-on.git
revision: cf52b870c07e8d6825a478a9669c9e384f580a32
branch: use_equality_where_possible
specs:
acts-as-taggable-on (2.2.2)
rails (~> 3.0)

GIT
remote: git://github.com/galetahub/simple-captcha.git
revision: b8493942e9a9bb58c58712fa21d41963330da6aa
specs:
simple_captcha (0.1.1)

GIT
remote: git://github.com/kennethlmartin/defender.git
revision: 795923014e4853b41ffbe72933388644e31de60f
specs:
defender (2.0.2)
activemodel (>= 3.0.0)
defensio (~> 0.9.1)

GIT
remote: git://github.com/opencongress/formageddon.git
revision: 753b862a593b472f47b00af2eef13e460a7eb4c8
Expand All @@ -29,6 +13,13 @@ GIT
haml
mechanize

GIT
remote: https://github.com/mbleigh/acts-as-taggable-on.git
revision: 4690e041e59114ad1d42efaa463462140a703dba
specs:
acts-as-taggable-on (2.2.2)
rails (~> 3.0)

GEM
remote: http://rubygems.org/
specs:
Expand Down Expand Up @@ -107,6 +98,9 @@ GEM
cucumber (>= 0.8.0)
culerity (0.2.15)
daemons (1.1.4)
defender (2.0.3)
activemodel (>= 3.0.0)
defensio (~> 0.9.1)
defensio (0.9.1)
httparty (>= 0.5.0)
delayed_job (2.1.4)
Expand Down Expand Up @@ -307,7 +301,7 @@ DEPENDENCIES
closure-compiler
cucumber (= 0.8.5)
cucumber-rails
defender!
defender
delayed_job (~> 2.1)
facebooker2
fog
Expand Down

0 comments on commit 3e82b0e

Please sign in to comment.