diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-04-09 12:16:27 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-04-09 12:16:27 +0200 |
commit | 305e82571f7c576b0ab3acc87d59c23c546a01d6 (patch) | |
tree | 78d05249589194bd7272da8b67cc0c99fbb0f51c | |
parent | 46a947538f2e4c51a5f71478d3c7b405e8c71772 (diff) | |
parent | d71b7748672cac99d7f759c286ba3e177f01dd62 (diff) | |
download | coderay-305e82571f7c576b0ab3acc87d59c23c546a01d6.tar.gz |
Merge branch 'master' into sass-scanner
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Gemfile | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -5,6 +5,8 @@ spec/reports doc Gemfile.lock .rvmrc +.ruby-gemset +.ruby-version test/executable/source.rb.html test/executable/source.rb.json test/scanners @@ -1,3 +1,5 @@ +source :rubygems + # Specify your gem's dependencies in coderay.gemspec gemspec @@ -9,6 +11,6 @@ group :development do gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3" gem "term-ansicolor" gem "shoulda-context", "~> 1.0.0" - gem "json" if RUBY_VERSION < '1.9' + gem "json" if RUBY_VERSION < '1.9' gem "rdoc" end |