Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: challengepost/hovercard
base: c9d2c9bb02
...
head fork: challengepost/hovercard
compare: 01a4e1b3d6
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 2 contributors
View
8 Gemfile
@@ -1,10 +1,6 @@
source "http://rubygems.org"
-gem "rails", "3.0.10"
+gem "rails", "3.1.3"
gem "capybara", ">= 0.4.0"
gem "sqlite3"
-gem "rake", "0.8.7"
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19'
+gem "rake", "0.9.2"
View
142 Gemfile.lock
@@ -1,90 +1,102 @@
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.10)
- actionpack (= 3.0.10)
- mail (~> 2.2.19)
- actionpack (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- activesupport (3.0.10)
- arel (2.0.10)
- builder (2.1.2)
- capybara (1.1.1)
+ actionmailer (3.1.3)
+ actionpack (= 3.1.3)
+ mail (~> 2.3.0)
+ actionpack (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.5)
+ rack-cache (~> 1.1)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.3)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ activesupport (3.1.3)
+ multi_json (~> 1.0)
+ arel (2.2.1)
+ builder (3.0.0)
+ capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.2.2)
+ childprocess (0.3.0)
ffi (~> 1.0.6)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- ffi (1.0.9)
- i18n (0.5.0)
- json_pure (1.6.1)
- mail (2.2.19)
- activesupport (>= 2.3.6)
+ erubis (2.7.0)
+ ffi (1.0.11)
+ hike (1.2.1)
+ i18n (0.6.0)
+ json (1.6.5)
+ mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
+ mime-types (1.17.2)
+ multi_json (1.0.4)
nokogiri (1.5.0)
- polyglot (0.3.2)
- rack (1.2.4)
- rack-mount (0.6.14)
+ polyglot (0.3.3)
+ rack (1.3.6)
+ rack-cache (1.1)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-test (0.5.7)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.10)
- actionmailer (= 3.0.10)
- actionpack (= 3.0.10)
- activerecord (= 3.0.10)
- activeresource (= 3.0.10)
- activesupport (= 3.0.10)
+ rails (3.1.3)
+ actionmailer (= 3.1.3)
+ actionpack (= 3.1.3)
+ activerecord (= 3.1.3)
+ activeresource (= 3.1.3)
+ activesupport (= 3.1.3)
bundler (~> 1.0)
- railties (= 3.0.10)
- railties (3.0.10)
- actionpack (= 3.0.10)
- activesupport (= 3.0.10)
+ railties (= 3.1.3)
+ railties (3.1.3)
+ actionpack (= 3.1.3)
+ activesupport (= 3.1.3)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.4)
- rake (0.8.7)
- rdoc (3.9.4)
- rubyzip (0.9.4)
- selenium-webdriver (2.7.0)
- childprocess (>= 0.2.1)
- ffi (>= 1.0.7)
- json_pure
+ thor (~> 0.14.6)
+ rake (0.9.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ rubyzip (0.9.5)
+ selenium-webdriver (2.17.0)
+ childprocess (>= 0.2.5)
+ ffi (~> 1.0.9)
+ multi_json (~> 1.0.4)
rubyzip
- sqlite3 (1.3.4)
+ sprockets (2.0.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.5)
thor (0.14.6)
+ tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.30)
+ tzinfo (0.3.31)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -93,6 +105,6 @@ PLATFORMS
DEPENDENCIES
capybara (>= 0.4.0)
- rails (= 3.0.10)
- rake (= 0.8.7)
+ rails (= 3.1.3)
+ rake (= 0.9.2)
sqlite3
View
2  hovercard.gemspec
@@ -6,5 +6,5 @@ Gem::Specification.new do |s|
s.summary = "Hovercards giving access to important actions and additional information on an item."
s.description = "Hovercards giving access to important actions and additional information on an item."
s.files = Dir["{app,lib,config}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.rdoc"]
- s.version = "1.0"
+ s.version = "1.1"
end
View
1  test/dummy/config/application.rb
@@ -1,7 +1,6 @@
require File.expand_path('../boot', __FILE__)
require "active_model/railtie"
-require "active_record/railtie"
require "action_controller/railtie"
require "action_view/railtie"
require "action_mailer/railtie"
View
3  test/test_helper.rb
@@ -15,8 +15,5 @@
Capybara.default_driver = :rack_test
Capybara.default_selector = :css
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-
# Load support files
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

No commit comments for this range

Something went wrong with that request. Please try again.