Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/simple_show/base.rb
  • Loading branch information...
2 parents 64e69a9 + d0b1a45 commit 7258be6b138e30cd6bb90a78d377819c84af8275 @demillir committed Oct 30, 2011
Showing with 4 additions and 2 deletions.
  1. +1 −1 .rvmrc
  2. +1 −0 lib/simple_show/base.rb
  3. +1 −1 lib/simple_show/version.rb
  4. +1 −0 simple_show.gemspec
View
2 .rvmrc
@@ -1 +1 @@
-rvm gemset use simple_show
+rvm use 1.8.7@simple_show
View
@@ -71,5 +71,6 @@ def value(attr, options = {}, &block)
def object
@record
end
+
end
end
@@ -1,3 +1,3 @@
module SimpleShow
- VERSION = "0.0.7"
+ VERSION = "0.0.8"
end
View
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
s.rubyforge_project = "simple_show"
s.files = `git ls-files`.split("\n")
+ s.files = s.files.delete_if { |path| path =~ /\.rvmrc/ }
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

0 comments on commit 7258be6

Please sign in to comment.