Merge branch 'staging'

ontohub · Oct 13, 2015 · 27e239d · 27e239d
2 parents f071185 + 44e0d21
commit 27e239d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/config/routes.rb b/config/routes.rb
@@ -701,12 +701,6 @@
     as:         :repository_tree,
     constraints: FilesRouterConstraint.new
 
-  get '*path',
-    controller:  :ontologies,
-    action:      :show,
-    as:          :iri,
-    constraints: IRIRouterConstraint.new
-
   root :to => 'home#index'
 
 end
diff --git a/lib/hets/hets_error_process.rb b/lib/hets/hets_error_process.rb
@@ -1,6 +1,6 @@
 module Hets
   class HetsErrorProcess
-    HETS_ERROR_CODES = %w(400, 422)
+    HETS_ERROR_CODES = %w(400, 422, 500)
     HETS_ERROR_MESSAGE_REGEXP = /\A[*]{3}\s*Error:\s*/
 
     attr_reader :error, :response

diff --git a/public/robots.txt b/public/robots.txt
@@ -1,5 +1,4 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
 User-Agent: *
-Disallow: /*?
-Disallow: /repositories/*/diff
+Disallow: /