From: Tom Hughes Date: Tue, 28 Jan 2025 18:26:24 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/5560' X-Git-Tag: live~67 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/f01cbc68c286b947d7b4e9971a518b26051a3ef2?hp=a7da2a5b3962a28e2cafbd6ae606290a29639a78 Merge remote-tracking branch 'upstream/pull/5560' --- diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5e6814451..bfeb3d33a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -65,7 +65,7 @@ jobs: - name: Run javascript tests run: bundle exec teaspoon - name: Report completion to Coveralls - uses: coverallsapp/github-action@v2.3.5 + uses: coverallsapp/github-action@v2.3.6 with: github-token: ${{ secrets.github_token }} flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }} @@ -77,7 +77,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Report completion to Coveralls - uses: coverallsapp/github-action@v2.3.5 + uses: coverallsapp/github-action@v2.3.6 with: github-token: ${{ secrets.github_token }} parallel-finished: true diff --git a/Gemfile b/Gemfile index 60a8fcace..2765b1ae7 100644 --- a/Gemfile +++ b/Gemfile @@ -130,9 +130,6 @@ gem "ffi-libarchive" gem "gd2-ffij", ">= 0.4.0" gem "marcel" -# Used for browser detection -gem "browser", "< 6" # for ruby 3.1 support - # Used for S3 object storage gem "aws-sdk-s3" diff --git a/Gemfile.lock b/Gemfile.lock index 615787927..761beefa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,8 +92,8 @@ GEM autoprefixer-rails (10.4.19.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.1040.0) - aws-sdk-core (3.216.0) + aws-partitions (1.1043.0) + aws-sdk-core (3.217.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -134,13 +134,12 @@ GEM brakeman (7.0.0) racc brotli (0.6.0) - browser (5.3.1) builder (3.3.0) bzip2-ffi (1.1.1) ffi (~> 1.0) cancancan (3.6.1) - canonical-rails (0.2.16) - actionview (>= 4.1, < 7.3) + canonical-rails (0.2.17) + actionview (>= 4.1, < 8.1) capybara (3.40.0) addressable matrix @@ -291,7 +290,7 @@ GEM rchardet (~> 1.8) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (3.25.5) + google-protobuf (3.25.6) hashdiff (1.1.2) hashie (5.0.0) highline (3.1.2) @@ -329,7 +328,7 @@ GEM in_threads (1.6.0) iniparse (1.5.0) io-console (0.8.0) - irb (1.15.0) + irb (1.15.1) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) @@ -349,7 +348,7 @@ GEM rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - language_server-protocol (3.17.0.3) + language_server-protocol (3.17.0.4) libv8-node (18.19.0.0) libxml-ruby (5.0.3) listen (3.9.0) @@ -452,7 +451,7 @@ GEM open4 (1.3.4) openstreetmap-deadlock_retry (1.3.1) ostruct (0.6.1) - overcommit (0.64.1) + overcommit (0.65.0) childprocess (>= 0.6.3, < 6) iniparse (~> 1.4) rexml (>= 3.3.9) @@ -550,7 +549,7 @@ GEM rouge (4.5.1) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.70.0) + rubocop (1.71.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -560,7 +559,7 @@ GEM rubocop-ast (>= 1.36.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.37.0) + rubocop-ast (1.38.0) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) @@ -572,7 +571,7 @@ GEM rubocop-performance (1.23.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.29.0) + rubocop-rails (2.29.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) @@ -683,7 +682,6 @@ DEPENDENCIES bootstrap (~> 5.3.2) bootstrap_form (~> 5.0) brakeman - browser (< 6) bzip2-ffi cancancan canonical-rails diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 85b5cb860..3b1f63f8b 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -17,8 +17,6 @@ //= link_tree ../../../vendor/assets/leaflet .png -//= link_directory ../../../vendor/assets/polyfill .js - //= link leaflet/dist/images/marker-icon.png //= link leaflet/dist/images/marker-icon-2x.png //= link leaflet/dist/images/marker-shadow.png diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js index c69959467..c10c6ed21 100644 --- a/app/assets/javascripts/index/layers/data.js +++ b/app/assets/javascripts/index/layers/data.js @@ -44,7 +44,7 @@ OSM.initializeDataLayer = function (map) { } } - function displayFeatureWarning(count, limit, add, cancel) { + function displayFeatureWarning(num_features, add, cancel) { $("#browse_status").html( $("
").append( $("
").append( @@ -55,17 +55,22 @@ OSM.initializeDataLayer = function (map) { .attr("aria-label", I18n.t("javascripts.close")) .click(cancel))), $("

") - .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })), + .text(I18n.t("browse.start_rjs.feature_warning", { num_features })), $("") .val(I18n.t("browse.start_rjs.load_data")) .click(add))); } - function displayLoadError(message) { + function displayLoadError(message, close) { $("#browse_status").html( $("

").append( - $("

") - .text(I18n.t("browse.start_rjs.load_data")), + $("
").append( + $("

") + .text(I18n.t("browse.start_rjs.load_data")), + $("
").append( + $("