diff --git a/.dockerignore b/.dockerignore index 85065ec7d..a5af77eb5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +1,6 @@ .bundle .env .env.* -.git -.gitignore docker-compose.* docker/Dockerfile docker/dockerfiles diff --git a/.gitignore b/.gitignore index 63d0781ca..e59f13b8f 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,7 @@ test/cypress/videos/* /config/master.key /config/*.enc -.vscode/settings.json +#ignore files under .vscode directory .vscode # yalc for local testing diff --git a/Procfile b/Procfile index 3cfa8ae13..f281f018a 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,3 @@ -release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare +release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare && echo $SOURCE_VERSION > .git_sha web: bundle exec rails ip_lookup:setup && bin/rails server -p $PORT -e $RAILS_ENV worker: bundle exec rails ip_lookup:setup && bundle exec sidekiq -C config/sidekiq.yml diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 25a981df6..ff6b5f57e 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -56,7 +56,8 @@ class DashboardController < ActionController::Base FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''), FACEBOOK_API_VERSION: 'v14.0', IS_ENTERPRISE: ChatwootApp.enterprise?, - AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', '') + AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', ''), + GIT_SHA: GIT_HASH } end end diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue index c04c1c76a..081d7a6f9 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue @@ -104,6 +104,9 @@ }) }} +