Skip to content
This repository

fix bundling issues #14

Merged
merged 1 commit into from about 2 years ago

2 participants

Doug Cole aross
Doug Cole

I deleted my fork of acts-as-taggable-on when my changes got merged in to the main project, but I forgot we were using it directly here. I also updated the defender gem as the git repo we were pointing at has beeen deleted.

The acts-as-taggable-on change is safe as it's nearly identical to what we were pointing at before, I'm less certain of the defender gem, so any help verifying that it still works as expected is appreciated.

aross aross merged commit 0d804cc into from
aross aross closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Apr 26, 2012
Doug Cole dougcole fix bundling issues 3e82b0e
This page is out of date. Refresh to see the latest.

Showing 2 changed files with 13 additions and 19 deletions. Show diff stats Hide diff stats

  1. +2 2 Gemfile
  2. +11 17 Gemfile.lock
4 Gemfile
@@ -65,7 +65,7 @@ gem "json"
65 65 gem "nokogiri"
66 66
67 67 # spam protection
68   -gem "defender", :git => 'git://github.com/kennethlmartin/defender.git'
  68 +gem "defender"
69 69
70 70 group :deployment do
71 71 gem 'capistrano'
@@ -84,7 +84,7 @@ gem 'will_paginate', '~> 3.0.pre2'
84 84 gem "validates_captcha"
85 85 gem "okkez-open_id_authentication"
86 86
87   -gem "acts-as-taggable-on", :git => 'git://github.com/dougcole/acts-as-taggable-on.git', :branch => 'use_equality_where_possible'
  87 +gem "acts-as-taggable-on", :git => 'https://github.com/mbleigh/acts-as-taggable-on.git'
88 88
89 89 gem 'mechanize'
90 90 #gem 'formageddon', '0.0.0', :require => 'formageddon', :path => '/Users/aross/Sites/formageddon'
28 Gemfile.lock
... ... @@ -1,26 +1,10 @@
1 1 GIT
2   - remote: git://github.com/dougcole/acts-as-taggable-on.git
3   - revision: cf52b870c07e8d6825a478a9669c9e384f580a32
4   - branch: use_equality_where_possible
5   - specs:
6   - acts-as-taggable-on (2.2.2)
7   - rails (~> 3.0)
8   -
9   -GIT
10 2 remote: git://github.com/galetahub/simple-captcha.git
11 3 revision: b8493942e9a9bb58c58712fa21d41963330da6aa
12 4 specs:
13 5 simple_captcha (0.1.1)
14 6
15 7 GIT
16   - remote: git://github.com/kennethlmartin/defender.git
17   - revision: 795923014e4853b41ffbe72933388644e31de60f
18   - specs:
19   - defender (2.0.2)
20   - activemodel (>= 3.0.0)
21   - defensio (~> 0.9.1)
22   -
23   -GIT
24 8 remote: git://github.com/opencongress/formageddon.git
25 9 revision: 753b862a593b472f47b00af2eef13e460a7eb4c8
26 10 specs:
@@ -29,6 +13,13 @@ GIT
29 13 haml
30 14 mechanize
31 15
  16 +GIT
  17 + remote: https://github.com/mbleigh/acts-as-taggable-on.git
  18 + revision: 4690e041e59114ad1d42efaa463462140a703dba
  19 + specs:
  20 + acts-as-taggable-on (2.2.2)
  21 + rails (~> 3.0)
  22 +
32 23 GEM
33 24 remote: http://rubygems.org/
34 25 specs:
@@ -107,6 +98,9 @@ GEM
107 98 cucumber (>= 0.8.0)
108 99 culerity (0.2.15)
109 100 daemons (1.1.4)
  101 + defender (2.0.3)
  102 + activemodel (>= 3.0.0)
  103 + defensio (~> 0.9.1)
110 104 defensio (0.9.1)
111 105 httparty (>= 0.5.0)
112 106 delayed_job (2.1.4)
@@ -307,7 +301,7 @@ DEPENDENCIES
307 301 closure-compiler
308 302 cucumber (= 0.8.5)
309 303 cucumber-rails
310   - defender!
  304 + defender
311 305 delayed_job (~> 2.1)
312 306 facebooker2
313 307 fog

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.