Merge branch 'master' into 1932-job-output-persistent
[arvados.git] / services / api / script / import_commits.rb
index 6c3221992aff6807e2230f79d3e1f9d9724840c3..80c574892ca4d502ec4de122f389a40211b36663 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-ENV["RAILS_ENV"] = ARGV[0] || "development"
+ENV["RAILS_ENV"] = ARGV[0] || ENV["RAILS_ENV"] || "development"
 
 require File.dirname(__FILE__) + '/../config/boot'
 require File.dirname(__FILE__) + '/../config/environment'