scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-26 00:36:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4437 from aignatov-bio/ai-sci-fix-merge-issues

Browse source 
Fix merge issues for templates
This commit is contained in:
aignatov-bio 2022-09-15 14:07:09 +02:00 committed by GitHub
commit cb57810370
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/application.rb
View file

@ -57,7 +57,7 @@ module Scinote
config.x.webhooks_enabled = ENV['ENABLE_WEBHOOKS'] == 'true'
config.x.zebra_print_enabled = ENV['ENABLE_ZEBRA_PRINTERS'] == 'true'
config.x.zebra_print_enabled = false
# Logging
config.log_formatter = proc do |severity, datetime, progname, msg|

2
config/initializers/extends.rb
View file

@ -421,7 +421,7 @@ class Extends
label_template_deleted: 218,
label_template_copied: 219,
edit_protocol_name_in_repository: 220,
protocol_name_in_task_edited: 221
protocol_name_in_task_edited: 221,
task_step_duplicated: 222,
protocol_step_duplicated: 223,
task_step_text_duplicated: 224,