Skip to content

Commit

Permalink
little gemfile cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ethn committed Sep 24, 2012
1 parent 5bfd916 commit e87d604
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 57 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Expand Up @@ -3,16 +3,14 @@ source 'http://rubygems.org'

# DEFAULT

gem 'rails', '~> 3.1.0'
gem 'rails', '~> 3.2'
gem 'htmlentities', '~> 4.3'
gem 'uuid', '~> 2.3'
gem 'paperclip', '~> 2.4'
gem 'rmagick', '~> 2.13'
gem "recaptcha", "~> 0.3"

gem 'xmlscan', '~> 0.3'
gem 'warden'

# the following two could be safely excluded on a local install (but are not known to cause problems)

gem "rubyzip", "~> 0.9" # only required in module. should be separated out.
Expand Down
102 changes: 48 additions & 54 deletions Gemfile.lock
@@ -1,41 +1,40 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.8)
actionpack (= 3.1.8)
mail (~> 2.3.3)
actionpack (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
actionmailer (3.2.8)
actionpack (= 3.2.8)
mail (~> 2.4.4)
actionpack (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.6)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
activemodel (3.1.8)
activesupport (= 3.1.8)
sprockets (~> 2.1.3)
activemodel (3.2.8)
activesupport (= 3.2.8)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
arel (~> 2.2.3)
activerecord (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.1.8)
activemodel (= 3.1.8)
activesupport (= 3.1.8)
activesupport (3.1.8)
multi_json (>= 1.0, < 1.3)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
airbrake (3.1.4)
builder
girl_friday
ansi (1.4.3)
archive-tar-minitar (0.5.2)
arel (2.2.3)
arel (3.0.2)
builder (3.0.3)
capybara (1.1.2)
mime-types (>= 1.16)
Expand All @@ -46,10 +45,10 @@ GEM
xpath (~> 0.1.4)
childprocess (0.3.5)
ffi (~> 1.0, >= 1.0.6)
cocaine (0.3.0)
coffee-rails (3.1.1)
cocaine (0.3.1)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
Expand Down Expand Up @@ -82,6 +81,7 @@ GEM
hike (1.2.1)
htmlentities (4.3.1)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
Expand All @@ -95,13 +95,13 @@ GEM
ruby_core_source (>= 0.1.4)
macaddr (1.6.1)
systemu (~> 2.5.0)
mail (2.3.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
minitest (3.4.0)
multi_json (1.2.0)
minitest (3.5.0)
multi_json (1.3.6)
mysql2 (0.3.11)
nokogiri (1.5.5)
paperclip (2.7.0)
Expand All @@ -111,33 +111,31 @@ GEM
mime-types
pg (0.12.2)
polyglot (0.3.3)
rack (1.3.6)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.1.8)
actionmailer (= 3.1.8)
actionpack (= 3.1.8)
activerecord (= 3.1.8)
activeresource (= 3.1.8)
activesupport (= 3.1.8)
rails (3.2.8)
actionmailer (= 3.2.8)
actionpack (= 3.2.8)
activerecord (= 3.2.8)
activeresource (= 3.2.8)
activesupport (= 3.2.8)
bundler (~> 1.0)
railties (= 3.1.8)
railties (= 3.2.8)
rails-dev-tweaks (0.6.1)
actionpack (~> 3.1)
railties (~> 3.1)
railties (3.1.8)
actionpack (= 3.1.8)
activesupport (= 3.1.8)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
Expand All @@ -151,7 +149,7 @@ GEM
rspec-core (2.11.1)
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.2)
rspec-mocks (2.11.3)
rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
Expand All @@ -170,25 +168,24 @@ GEM
archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.9)
sass (3.2.1)
sass-rails (3.1.6)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3.2)
tilt (~> 1.3)
selenium-webdriver (2.25.0)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
spork (0.9.2)
sprockets (2.0.4)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
systemu (2.5.2)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
thor (0.14.6)
thor (0.16.0)
tilt (1.3.3)
timecop (0.3.5)
tinymce-rails (3.5.6)
Expand All @@ -204,8 +201,6 @@ GEM
multi_json (~> 1.0, >= 1.0.2)
uuid (2.3.5)
macaddr (~> 1.0)
warden (1.2.1)
rack (>= 1.0)
xmlscan (0.3.0)
xpath (0.1.4)
nokogiri (~> 1.3)
Expand All @@ -227,7 +222,7 @@ DEPENDENCIES
mysql2 (~> 0.3)
paperclip (~> 2.4)
pg (~> 0.12.2)
rails (~> 3.1.0)
rails (~> 3.2)
rails-dev-tweaks (~> 0.6)
rdoc
recaptcha (~> 0.3)
Expand All @@ -245,7 +240,6 @@ DEPENDENCIES
turn (~> 0.8.3)
uglifier
uuid (~> 2.3)
warden
win32-process (~> 0.6)
win32console (~> 1.3)
xmlscan (~> 0.3)
Empty file removed vendor/assets/stylesheets/.gitkeep
Empty file.

0 comments on commit e87d604

Please sign in to comment.