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: jejacks0n/mercury
base: master
...
head fork: jbrien/mercury
compare: rails-3.2
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 3 additions and 3 deletions.
  1. +1 −1  lib/mercury-rails.rb
  2. +2 −2 mercury-rails.gemspec
View
2  lib/mercury-rails.rb
@@ -1,3 +1,3 @@
-require 'paperclip'
+#require 'paperclip'
require File.expand_path('../config/engine', File.dirname(__FILE__))
View
4 mercury-rails.gemspec
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
# Runtime Dependencies
- s.add_runtime_dependency('rails', ["~> 3.1.0"])
- s.add_runtime_dependency('paperclip')
+ s.add_runtime_dependency('rails', [">= 3.2.0.rc1"])
+ #s.add_runtime_dependency('paperclip')
s.add_runtime_dependency('coffee-script')

No commit comments for this range

Something went wrong with that request. Please try again.