From 0f74ad944fff8611963e38fd7cbf14309a5af2aa Mon Sep 17 00:00:00 2001
From: Lars Hvam <larshp@hotmail.com>
Date: Tue, 13 Aug 2024 09:22:55 +0200
Subject: [PATCH] dont hide experimental settings, just disable it (#7014)

---
 package.json                                  | 10 ++++----
 .../zcl_abapgit_gui_page_sett_glob.clas.abap  | 24 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index c73f94930..2ccf41c18 100644
--- a/package.json
+++ b/package.json
@@ -23,14 +23,14 @@
     ]
   },
   "devDependencies": {
-    "@abaplint/cli": "^2.112.8",
+    "@abaplint/cli": "^2.112.14",
     "@abaplint/database-sqlite": "^2.8.25",
-    "@abaplint/runtime": "^2.10.5",
+    "@abaplint/runtime": "^2.10.9",
     "express": "^4.19.2",
-    "@abaplint/transpiler-cli": "^2.10.5",
-    "globals": "^15.8.0",
+    "@abaplint/transpiler-cli": "^2.10.9",
+    "globals": "^15.9.0",
     "abapmerge": "^0.16.0",
     "c8": "^10.1.2",
-    "eslint": "^9.8.0"
+    "eslint": "^9.9.0"
   }
 }
diff --git a/src/ui/pages/sett/zcl_abapgit_gui_page_sett_glob.clas.abap b/src/ui/pages/sett/zcl_abapgit_gui_page_sett_glob.clas.abap
index c92db8563..8464ebc44 100644
--- a/src/ui/pages/sett/zcl_abapgit_gui_page_sett_glob.clas.abap
+++ b/src/ui/pages/sett/zcl_abapgit_gui_page_sett_glob.clas.abap
@@ -163,18 +163,18 @@ CLASS zcl_abapgit_gui_page_sett_glob IMPLEMENTATION.
       iv_name        = c_id-commitmsg_hide_author
       iv_label       = 'Hide Author Fields' ).
 
-    IF zcl_abapgit_factory=>get_environment( )->is_merged( ) = abap_false.
-      ro_form->start_group(
-        iv_name        = c_id-devint_settings
-        iv_label       = 'Development Internal Settings'
-      )->checkbox(
-        iv_name        = c_id-run_critical_tests
-        iv_label       = 'Enable Critical Unit Tests'
-      )->text(
-        iv_name        = c_id-experimental_features
-        iv_label       = 'Experimental Features'
-        iv_hint        = 'Set to "X" to enable all features or add feature values as a comma-separated list' ).
-    ENDIF.
+    ro_form->start_group(
+      iv_name        = c_id-devint_settings
+      iv_label       = 'Development Internal Settings'
+    )->checkbox(
+      iv_name        = c_id-run_critical_tests
+      iv_label       = 'Enable Critical Unit Tests'
+      iv_readonly    = zcl_abapgit_factory=>get_environment( )->is_merged( )
+    )->text(
+      iv_name        = c_id-experimental_features
+      iv_label       = 'Experimental Features'
+      iv_readonly    = zcl_abapgit_factory=>get_environment( )->is_merged( )
+      iv_hint        = 'Set to "X" to enable all features or add feature values as a comma-separated list' ).
 
     ro_form->command(
       iv_label       = 'Save Settings'