From 370b3a03edce7908b4a9589c01ffc1091eea5a8b Mon Sep 17 00:00:00 2001 From: Ivan Kljun Date: Mon, 8 Jan 2024 12:00:26 +0100 Subject: [PATCH 1/4] Remove blur event listener from legacy inline edit [SCI-9951] --- app/assets/javascripts/shared/inline_editing.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/javascripts/shared/inline_editing.js b/app/assets/javascripts/shared/inline_editing.js index afd1c1fc7..657fe46a4 100644 --- a/app/assets/javascripts/shared/inline_editing.js +++ b/app/assets/javascripts/shared/inline_editing.js @@ -148,9 +148,6 @@ let inlineEditing = (function() { $(editBlocks).click(); } }) - .on('blur', `${editBlocks} textarea, ${editBlocks} input`, function(e) { - saveAllEditFields(); - }) .on('click', editBlocks, function(e) { // 'A' mean that, if we click on element we will not go in edit mode var container = $(this); From 5d4234a376a1ea41e73e24244d9b5109a9faa6a4 Mon Sep 17 00:00:00 2001 From: Gregor Lasnibat Date: Thu, 4 Jan 2024 13:38:13 +0100 Subject: [PATCH 2/4] (fix) Wide code sample on a shared task [SCI-9942] --- .../javascripts/shareable_links/handson_table_wraping.js | 2 +- app/views/layouts/shareable_links.html.erb | 6 +++--- app/views/shareable_links/my_module_protocol_show.html.erb | 2 +- app/views/shareable_links/my_modules/_protocol.html.erb | 2 +- .../shareable_links/my_modules/step_elements/_text.html.erb | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/shareable_links/handson_table_wraping.js b/app/assets/javascripts/shareable_links/handson_table_wraping.js index b94b018c9..084c6d1ae 100644 --- a/app/assets/javascripts/shareable_links/handson_table_wraping.js +++ b/app/assets/javascripts/shareable_links/handson_table_wraping.js @@ -10,7 +10,7 @@ if ($(table).parent().hasClass('table-wrapper')) return; $(table).wrap(` -
+
`); } } diff --git a/app/views/layouts/shareable_links.html.erb b/app/views/layouts/shareable_links.html.erb index 34e0dbc3c..cc00f3039 100644 --- a/app/views/layouts/shareable_links.html.erb +++ b/app/views/layouts/shareable_links.html.erb @@ -30,11 +30,11 @@
-
+
<%= render "shareable_links/my_modules/left_navigation" %>
-
+
<%= yield %>
diff --git a/app/views/shareable_links/my_module_protocol_show.html.erb b/app/views/shareable_links/my_module_protocol_show.html.erb index 44e480fed..6e1d46ec6 100644 --- a/app/views/shareable_links/my_module_protocol_show.html.erb +++ b/app/views/shareable_links/my_module_protocol_show.html.erb @@ -46,7 +46,7 @@
<% if @my_module.description.present? %> -
+
<%= smart_annotation_text(@my_module.shareable_tinymce_render(:description)) %>
<% else %> diff --git a/app/views/shareable_links/my_modules/_protocol.html.erb b/app/views/shareable_links/my_modules/_protocol.html.erb index 8ff8858e3..6a83bb5a9 100644 --- a/app/views/shareable_links/my_modules/_protocol.html.erb +++ b/app/views/shareable_links/my_modules/_protocol.html.erb @@ -42,7 +42,7 @@
<% if protocol.description.present? %> -
+
<%= smart_annotation_text(protocol.shareable_tinymce_render(:description)) %>
<% else %> diff --git a/app/views/shareable_links/my_modules/step_elements/_text.html.erb b/app/views/shareable_links/my_modules/step_elements/_text.html.erb index ff0eaf420..a373cdc4d 100644 --- a/app/views/shareable_links/my_modules/step_elements/_text.html.erb +++ b/app/views/shareable_links/my_modules/step_elements/_text.html.erb @@ -8,7 +8,7 @@
<% end %> <% if element.text.present? %> -
+
<%= smart_annotation_text(element.shareable_tinymce_render(:text)) %>
<% else %> From 8fba5a89d901156ab515970b5b95e7240bd26102 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 10 Jan 2024 10:45:13 +0100 Subject: [PATCH 3/4] Bump version to 1.29.6 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 42572d848..f5519b88a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.29.5.1 +1.29.6 From 7b49db6ff97f8037b0f03ea4964d0597497a8a9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:05:18 +0100 Subject: [PATCH 4/4] Bump puma from 6.3.1 to 6.4.2 (#6904) Bumps [puma](https://github.com/puma/puma) from 6.3.1 to 6.4.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.3.1...v6.4.2) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e9992fd3e..3ee29feb9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -442,7 +442,7 @@ GEM net-smtp (0.3.3) net-protocol newrelic_rpm (9.2.2) - nio4r (2.5.9) + nio4r (2.7.0) nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -505,7 +505,7 @@ GEM pry (>= 0.10.4) psych (3.3.4) public_suffix (5.0.1) - puma (6.3.1) + puma (6.4.2) nio4r (~> 2.0) raabro (1.4.0) racc (1.7.1)