[myexperiment-hackers] [3155] branches/wf4ever: cd branches/wf4ever ; svn merge -r 3142:3154 ^/ trunk

[noreply]

Revision

3155

Author

dgc

Date

2012-10-10 14:27:01 +0000 (Wed, 10 Oct 2012)

Log Message

cd branches/wf4ever ; svn merge -r 3142:3154 ^/trunk

Modified Paths

• branches/wf4ever/Gemfile
• branches/wf4ever/app/models/workflow.rb

Added Paths

• branches/wf4ever/workflow-to-galaxy-0.3.4.gem

Diff

Modified: branches/wf4ever/Gemfile (3154 => 3155)

--- branches/wf4ever/Gemfile	2012-10-10 12:49:45 UTC (rev 3154)
+++ branches/wf4ever/Gemfile	2012-10-10 14:27:01 UTC (rev 3155)
@@ -2,7 +2,7 @@
 
 gem "rails", "2.3.14"
 gem "mysql", "~> 2.8.1"
-gem "mongrel", "~> 1.2.0.pre2"
+gem "mongrel", "~> 1.1.5"
 gem "mongrel_cluster", "~> 1.0.5"
 gem "rubyzip", "~> 0.9.4"
 gem "oauth", "~> 0.4.3"
@@ -16,8 +16,8 @@
 gem "ruby-hmac", "~> 0.4.0"
 gem "passenger", "~> 2.2.15"
 gem "htmlentities", "~> 4.3.1"
-gem "taverna-scufl", "~> 0.7.1"
-gem "taverna-t2flow", "~> 0.2.0"
+gem "taverna-scufl", "~> 0.7.2"
+gem "taverna-t2flow", "~> 0.3.0"
 gem "rdf", "~> 0.3.4.1"
 gem "rdf-raptor", "~> 0.4.1"
 gem "wf4ever-transformation-client", "~> 0.3.0"

Modified: branches/wf4ever/app/models/workflow.rb (3154 => 3155)

--- branches/wf4ever/app/models/workflow.rb	2012-10-10 12:49:45 UTC (rev 3154)
+++ branches/wf4ever/app/models/workflow.rb	2012-10-10 14:27:01 UTC (rev 3155)
@@ -57,7 +57,7 @@
     :mutable => [ :contributor, :title, :unique_name, :body, :body_html,
                   :file_ext, :last_edited_by, :content_type_id, :image, :svg ]
 
-  acts_as_solr(:fields => [ :title, :body, :tag_list, :contributor_name, :kind, :get_all_search_terms ],
+  acts_as_solr(:fields => [ :title, :body, :filename, :tag_list, :contributor_name, :kind, :get_all_search_terms ],
                :boost => "rank",
                :include => [ :comments ]) if Conf.solr_enable
 

Copied: branches/wf4ever/workflow-to-galaxy-0.3.4.gem (from rev 3154, trunk/workflow-to-galaxy-0.3.4.gem)

(Binary files differ)