From 5a35ab96776d6c969fec68fad7ab27df772f2751 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Thu, 23 Feb 2017 09:46:04 +0100 Subject: [PATCH 1/4] Test Deface change --- config/environments/production.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/environments/production.rb b/config/environments/production.rb index a2069257b..a3a7913a1 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -98,6 +98,9 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false + # Disable deface if neccesary + config.deface.enabled = ENV['DEFACE_ENABLED'] == 'true' + # Enable first-time tutorial for users signing in the sciNote for # the first time. config.x.enable_tutorial = ENV['ENABLE_TUTORIAL'] != 'false' From 0a271843a43a2ae49545446bb7d0576b362c6f5c Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Thu, 23 Feb 2017 10:39:34 +0100 Subject: [PATCH 2/4] Also (temporarily) add this to development.rb --- config/environments/development.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/environments/development.rb b/config/environments/development.rb index d2c9395d0..455fa6981 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -65,6 +65,8 @@ Rails.application.configure do # Raises error for missing translations config.action_view.raise_on_missing_translations = true + config.deface.enabled = ENV['DEFACE_ENABLED'] == 'true' + # Enable first-time tutorial for users signing in the sciNote for # the first time. config.x.enable_tutorial = ENV['ENABLE_TUTORIAL'] == 'true' From de8034c5b9d978ab6d44ceacfb101d1ef591c9d6 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Mon, 27 Feb 2017 09:40:01 +0100 Subject: [PATCH 3/4] Update environment settings --- config/environments/development.rb | 1 + config/environments/production.rb | 2 +- config/environments/test.rb | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 455fa6981..1c3101ca7 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -65,6 +65,7 @@ Rails.application.configure do # Raises error for missing translations config.action_view.raise_on_missing_translations = true + # Enable/disable Deface config.deface.enabled = ENV['DEFACE_ENABLED'] == 'true' # Enable first-time tutorial for users signing in the sciNote for diff --git a/config/environments/production.rb b/config/environments/production.rb index a3a7913a1..a7c63d0be 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -98,7 +98,7 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - # Disable deface if neccesary + # Enable/disable Deface config.deface.enabled = ENV['DEFACE_ENABLED'] == 'true' # Enable first-time tutorial for users signing in the sciNote for diff --git a/config/environments/test.rb b/config/environments/test.rb index 5a7dc5627..27782d2b6 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -65,6 +65,9 @@ Rails.application.configure do # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + # Enable/disable Deface + config.deface.enabled = ENV['DEFACE_ENABLED'] == 'true' + # Enable first-time tutorial for users signing in the sciNote for # the first time. config.x.enable_tutorial = false From 8e09e86a0e01707a2ca24f8948f71649a96543fe Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Mon, 27 Feb 2017 12:54:51 +0100 Subject: [PATCH 4/4] Change Deface config so it defaults to 'true' --- config/environments/development.rb | 2 +- config/environments/production.rb | 2 +- config/environments/test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 1c3101ca7..ddcca9b21 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -66,7 +66,7 @@ Rails.application.configure do config.action_view.raise_on_missing_translations = true # Enable/disable Deface - config.deface.enabled = ENV['DEFACE_ENABLED'] == 'true' + config.deface.enabled = ENV['DEFACE_ENABLED'] != 'false' # Enable first-time tutorial for users signing in the sciNote for # the first time. diff --git a/config/environments/production.rb b/config/environments/production.rb index a7c63d0be..197f1a42c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -99,7 +99,7 @@ Rails.application.configure do config.active_record.dump_schema_after_migration = false # Enable/disable Deface - config.deface.enabled = ENV['DEFACE_ENABLED'] == 'true' + config.deface.enabled = ENV['DEFACE_ENABLED'] != 'false' # Enable first-time tutorial for users signing in the sciNote for # the first time. diff --git a/config/environments/test.rb b/config/environments/test.rb index 27782d2b6..f917df2bd 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -66,7 +66,7 @@ Rails.application.configure do # config.action_view.raise_on_missing_translations = true # Enable/disable Deface - config.deface.enabled = ENV['DEFACE_ENABLED'] == 'true' + config.deface.enabled = ENV['DEFACE_ENABLED'] != 'false' # Enable first-time tutorial for users signing in the sciNote for # the first time.