diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3e63def27..934a82fec 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base before_action :api_check before_action :ip_ban_check before_action :set_variant - before_action :enable_cors + before_action :add_headers before_action :cause_error after_action :reset_current_user layout "default" @@ -65,8 +65,9 @@ class ApplicationController < ActionController::Base protected - def enable_cors + def add_headers response.headers["Access-Control-Allow-Origin"] = "*" + response.headers["X-Git-Hash"] = Rails.application.config.x.git_hash end def api_check diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 03d11c3c5..7944e26c1 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -77,6 +77,8 @@ <%= tag.meta name: "twitter:title", content: page_title %> <%= tag.meta name: "twitter:description", content: meta_description %> + <%= tag.meta name: "git-hash", content: Rails.application.config.x.git_hash %> + <%= yield :html_header %> <%= raw Danbooru.config.custom_html_header_content %> diff --git a/config/application.rb b/config/application.rb index 075a741f2..c8a3373fc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -50,7 +50,7 @@ module Danbooru if File.exist?("#{config.root}/REVISION") config.x.git_hash = File.read("#{config.root}/REVISION").strip elsif system("type git > /dev/null && git rev-parse --show-toplevel > /dev/null") - config.x.git_hash = `git rev-parse --short HEAD`.strip + config.x.git_hash = `git rev-parse HEAD`.strip else config.x.git_hash = nil end