summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-05-12 17:15:08 +0000
committerChristoph Helma <helma@in-silico.ch>2011-05-12 17:15:08 +0000
commit8ebcbcb7980fc7c11894a4b750f5a17a95048fd9 (patch)
tree858c2f5ef38f9506f5a76185fc93081f266a1a4d
parentcb3c1dd486ba0a891c81886c1546553fc17f01b8 (diff)
parent8dd7fb5b440d02e6c2aea2d63ced2badc9b680f7 (diff)
Merge branch 'development' of github.com:opentox/opentox-ruby into development
-rw-r--r--Rakefile2
-rw-r--r--lib/overwrite.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index d238a5b..eb6504c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -53,7 +53,7 @@ begin
#valiation-gem
gem.add_dependency "haml", ">=3"
# validation-gems
- gem.add_dependency "ruby-plot", "=0.0.2"
+ gem.add_dependency "ruby-plot", "=0.0.3"
['jeweler'].each { |dep| gem.add_development_dependency dep }
gem.files = FileList["[A-Z]*", "{bin,generators,lib,test}/**/*", 'lib/jeweler/templates/.gitignore']
end
diff --git a/lib/overwrite.rb b/lib/overwrite.rb
index fffcb14..df4e1b7 100644
--- a/lib/overwrite.rb
+++ b/lib/overwrite.rb
@@ -8,6 +8,7 @@ before {
$url_provider = self
# stupid internet explorer does not ask for text/html, add this manually
request.env['HTTP_ACCEPT'] += ";text/html" if request.env["HTTP_USER_AGENT"]=~/MSIE/
+ request.env['HTTP_ACCEPT']=request.params["media"] if request.params["media"]
}
# Error handling