X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5a55113805af906145449be18ec86b1a95a5017b..0fb40a0d01d6e6500ea6f87e45476daab511a1f2:/apps/workbench/config/application.default.yml diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml index 1650e12f4d..00959bbb3b 100644 --- a/apps/workbench/config/application.default.yml +++ b/apps/workbench/config/application.default.yml @@ -1,45 +1,6 @@ # Do not use this file for site configuration. Create application.yml # instead (see application.yml.example). -<% -# If you change any of the code in this block, you'll probably also want -# to update it in API server's application.default.yml. -def info_cmd(*args, &block) - IO.popen(args, "r", chdir: Rails.root, err: "/dev/null", &block) -end - -source_version = "" -local_modified = false -if Rails.env == "production" - # Read the version from our package's git-commit.version file, if available. - begin - source_version = IO.read(Rails.root.join("git-commit.version")).strip - rescue Errno::ENOENT - end -end - -if source_version.empty? - begin - status_output = false - info_cmd("git", "status", "-s") do |git_pipe| - git_pipe.each_line do |_| - status_output = true - # Continue reading the pipe so git doesn't get SIGPIPE. - end - end - if $?.success? - info_cmd("git", "log", "-n1", "--format=%H") do |git_pipe| - git_pipe.each_line do |line| - source_version = line.chomp - end - end - local_modified = status_output - end - rescue SystemCallError - end -end -%> - # Below is a sample setting for diagnostics testing. # Configure workbench URL as "arvados_workbench_url" # Configure test user tokens as "user_tokens". @@ -84,7 +45,6 @@ development: assets.debug: true profiling_enabled: true site_name: Arvados Workbench (dev) - local_modified: "<%= local_modified ? '-modified' : '' %>" # API server configuration arvados_login_base: ~ @@ -222,9 +182,11 @@ common: # the profile page. user_profile_form_message: Welcome to Arvados. All required fields must be completed before you can proceed. - # source_version - source_version: "<%= source_version[0...8] %>" - local_modified: false + # Override the automatic version string. With the default value of + # false, the version string is read from git-commit.version in + # Rails.root (included in vendor packages) or determined by invoking + # "git log". + source_version: false # report notification to and from addresses issue_reporter_email_from: arvados@example.com