Merge branch 'hotfix/2.5.2'

unipept · Mar 26, 2015 · 0214ca1 · 0214ca1
2 parents b450388 + 11b34a0
commit 0214ca1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/views/sequences/show.html.erb b/app/views/sequences/show.html.erb
@@ -68,7 +68,7 @@
             <th class="id">Uniprot ID</th>
             <th class="organism">Organism</th>
             <th class="ec">EC number</th>
-            <!--<th class="go">GO terms</th>-->
+            <th class="go">GO terms</th>
           </tr></thead>
           <% for entry in @entries do %>
             <% unless entry.name.nil? %>
@@ -86,7 +86,7 @@
                 </td>
                 <td><%= link_to entry.name.name, "http://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id="+entry.name.id.to_s, :target => "_blank" %></td>
                 <td><%= raw(entry.ec_cross_references.map{|ec| "<a href='http://enzyme.expasy.org/EC/"+ec.ec_id+"' target='_blank'>"+ec.ec_id+"</a>"}.join(", ")) %></td>
-                <!--<td><%= raw(entry.go_cross_references.map{|go| "<a href='http://amigo.geneontology.org/amigo/term/"+go.go_id+"' target='_blank'>"+go.go_id+"</a>"}.join(", ")) %></td>-->
+                <td><%= raw(entry.go_cross_references.map{|go| "<a href='http://amigo.geneontology.org/amigo/term/"+go.go_id+"' target='_blank'>"+go.go_id+"</a>"}.join(", ")) %></td>
               </tr>
             <% end %>
           <% end %>

diff --git a/config/application.rb b/config/application.rb
@@ -54,9 +54,9 @@ class Application < Rails::Application
     config.assets.paths << "#{Rails}/vendor/assets/fonts"
 
     config.versions = {
-      :unipept => "2.5.1",
+      :unipept => "2.5.2",
       :gem => "0.5.7",
-      :uniprot => "2014.05"
+      :uniprot => "2015.02"
     }
 
     config.api_host = "api.unipept.ugent.be"