Merge pull request #334 from gtt-project/next

Prepares for release 5.1.2

Author: dkastl

app/overrides/issues.rb

@@ -0,0 +1,15 @@
+Deface::Override.new(
+  :virtual_path => "issues/index",
+  :name => "deface_view_issues_index_map",
+  :insert_after => "h2",
+  :original => 'b807967c7184cb012c4bd5ccce90893349bc66e3',
+  :partial => "issues/index/map"
+)
+
+Deface::Override.new(
+  :virtual_path => "issues/index",
+  :name => "deface_view_issues_index_format_geojson",
+  :insert_after => "erb[loud]:contains('PDF')",
+  :original => '2b4102bf118f0a9866cf50477dce9cc7a78da6d5',
+  :partial => "issues/index/geojson"
+)

app/overrides/issues/index.rb

@@ -0,0 +1,15 @@
+Deface::Override.new(
+  :virtual_path => "issues/show",
+  :name => "deface_view_issues_show_map",
+  :insert_before => "div.attributes",
+  :original => 'c56981aa84b0fee66ff43ea773cf1444193a2862',
+  :partial => "issues/show/map"
+)
+
+Deface::Override.new(
+  :virtual_path => "issues/show",
+  :name => "deface_view_issues_show_format_geojson",
+  :insert_after => "erb[loud]:contains('PDF')",
+  :original => '1419e0dcba37f62ff95372d41d9b73845889d826',
+  :partial => "issues/show/geojson"
+)

app/overrides/issues/show.rb

@@ -0,0 +1,15 @@
+Deface::Override.new(
+  :virtual_path => "projects/show",
+  :name => "deface_view_projects_show_map",
+  :insert_bottom => "div.splitcontentright",
+  :original => 'b939fb5ea208476399dbfb4b253dcff0ab1ace91',
+  :partial => "projects/show/map"
+)
+
+Deface::Override.new(
+  :virtual_path => "projects/show",
+  :name => "deface_view_projects_show_other_formats",
+  :insert_bottom => "div.splitcontentright",
+  :original => '1d2f0cb0b1439dddc34ac9c50b6b1b111fe702ce',
+  :partial => "projects/show/other_formats"
+)

app/overrides/projects.rb

@@ -0,0 +1,7 @@
+Deface::Override.new(
+  :virtual_path => "users/show",
+  :name => "deface_view_users_show_other_formats",
+  :insert_bottom => "div.splitcontentleft",
+  :original => 'abe916df0691ebe8848cfc0dde536abd3bfe39b8',
+  :partial => "users/show/other_formats"
+)

app/overrides/projects/show.rb

@@ -8,7 +8,7 @@
   author_url 'https://github.com/georepublic'
   url 'https://github.com/gtt-project/redmine_gtt'
   description 'Adds location-based task management and maps'
-  version '5.1.0'
+  version '5.1.2'
 
   requires_redmine :version_or_higher => '5.0.0'
 
@@ -58,9 +58,10 @@
 end
 
 if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled?
-  require File.expand_path('../app/overrides/issues', __FILE__)
-  require File.expand_path('../app/overrides/projects', __FILE__)
-  require File.expand_path('../app/overrides/users', __FILE__)
+  Dir.glob("#{Rails.root}/plugins/redmine_gtt/app/overrides/**/*.rb").each do |path|
+    Rails.autoloaders.main.ignore(path)
+    require path
+  end
   RedmineGtt.setup_normal_patches
   Rails.application.config.after_initialize do
     RedmineGtt.setup_controller_patches

app/overrides/users.rb

@@ -22,28 +22,28 @@
   "dependencies": {
     "@juggle/resize-observer": "^3.4.0",
     "@mdi/font": "^7.4.47",
-    "dompurify": "^3.1.5",
+    "dompurify": "^3.1.6",
     "fontfaceobserver": "^2.3.0",
     "geojson": "^0.5.0",
-    "ol": "^9.1.0",
-    "ol-ext": "^4.0.15",
-    "ol-mapbox-style": "^12.3.4"
+    "ol": "^10.1.0",
+    "ol-ext": "^4.0.23",
+    "ol-mapbox-style": "^12.3.5"
   },
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/fontfaceobserver": "^2.1.3",
     "@types/geojson": "^7946.0.14",
-    "@types/google.maps": "^3.55.11",
+    "@types/google.maps": "^3.55.12",
     "@types/jquery": "^3.5.30",
     "@types/jqueryui": "^1.12.23",
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext",
     "css-loader": "^7.1.2",
-    "sass": "^1.77.6",
-    "sass-loader": "^14.2.1",
+    "sass": "^1.77.8",
+    "sass-loader": "^16.0.1",
     "style-loader": "^4.0.0",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.5.3",
-    "webpack": "^5.92.1",
+    "typescript": "^5.5.4",
+    "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4"
   }
 }