summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-07-12 11:39:02 +0200
committerrautenberg <rautenberg@in-silico.ch>2012-07-12 11:39:02 +0200
commit3e3034cf2c4c40081dc9753618da6dace1bd3251 (patch)
treec0aa9bb7c945b5a9733a9026a52549708bb6213e
parent6fc261cb3e6f39b55a206353fb9bc5c7d5479d7b (diff)
parent68832efb9d72645676c795116919dad92947fb73 (diff)
Merge branch 'release/v3.2.0' into developmentdevelopment
-rw-r--r--ChangeLog3
-rw-r--r--application.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51762ea..9661697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+v4.0.0 2012-07-12
+ * switch to opentox-ruby version 4.0.0
+ * deprecation notice added in create view
v3.0.1 2011-10-19
* assign a model to an endpoints on creating a new model,
endpoint-list from ontology service,
diff --git a/application.rb b/application.rb
index b6ea9cc..6e8099b 100644
--- a/application.rb
+++ b/application.rb
@@ -1,7 +1,7 @@
['rubygems', "haml", "sass", "rack-flash"].each do |lib|
require lib
end
-gem "opentox-ruby", "~> 3"
+gem "opentox-ruby", "~> 4"
require 'opentox-ruby'
gem 'sinatra-static-assets'
require 'sinatra/static_assets'