summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <ch@in-silico.ch>2010-02-08 17:56:55 +0100
committerChristoph Helma <ch@in-silico.ch>2010-02-08 17:56:55 +0100
commit632bdf0fa52410f14148cda89f70ea1f23909827 (patch)
tree824a913e40e0625c219a0ea578976097364e38ca
parent025dcd3591216a8e1c11aebd912f364b5a022965 (diff)
parente33f2e9cd78fcb75039224efd316369fd8ff39c5 (diff)
Merge branch 'test' of git@github.com:helma/opentox-compound into test
-rw-r--r--application.rb2
-rw-r--r--config.ru2
2 files changed, 2 insertions, 2 deletions
diff --git a/application.rb b/application.rb
index 3783176..76b22c0 100644
--- a/application.rb
+++ b/application.rb
@@ -1,5 +1,5 @@
require 'rubygems'
-gem 'opentox-ruby-api-wrapper', '=1.2.6'
+gem 'opentox-ruby-api-wrapper', '= 1.2.7'
require 'opentox-ruby-api-wrapper'
set :lock, true
diff --git a/config.ru b/config.ru
index 1c00295..ec0402a 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,4 @@
require 'rubygems'
require 'opentox-ruby-api-wrapper'
-require 'tasks/config'
+require 'config/config_ru'
run Sinatra::Application