Merge branch 'release/1.5.1'
This commit is contained in:
2
Procfile
2
Procfile
@@ -1,3 +1,3 @@
|
|||||||
release: bundle exec rake db:migrate
|
release: bundle exec rails db:prepare
|
||||||
web: bin/rails server -p $PORT -e $RAILS_ENV
|
web: bin/rails server -p $PORT -e $RAILS_ENV
|
||||||
worker: bundle exec sidekiq -C config/sidekiq.yml
|
worker: bundle exec sidekiq -C config/sidekiq.yml
|
||||||
|
|||||||
3
app.json
3
app.json
@@ -12,9 +12,6 @@
|
|||||||
"vue"
|
"vue"
|
||||||
],
|
],
|
||||||
"success_url": "/app/login",
|
"success_url": "/app/login",
|
||||||
"scripts": {
|
|
||||||
"postdeploy": "bundle exec rake db:schema:load && bundle exec rake db:seed"
|
|
||||||
},
|
|
||||||
"env": {
|
"env": {
|
||||||
"SECRET_TOKEN": {
|
"SECRET_TOKEN": {
|
||||||
"description": "A secret key for verifying the integrity of signed cookies.",
|
"description": "A secret key for verifying the integrity of signed cookies.",
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ class ConfigLoader
|
|||||||
if config
|
if config
|
||||||
return false if config.value.to_s == account_features.to_s
|
return false if config.value.to_s == account_features.to_s
|
||||||
|
|
||||||
compare_and_save(config)
|
compare_and_save_feature(config)
|
||||||
else
|
else
|
||||||
save_as_new_config({ name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS', value: account_features })
|
save_as_new_config({ name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS', value: account_features })
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user