From: Tom Hughes <tom@compton.nu>
Date: Sun, 20 Aug 2023 10:04:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4169'
X-Git-Tag: live~666
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2a1689f9621b7ec94e4935ea11fe64a45390ef7d?hp=-c

Merge remote-tracking branch 'upstream/pull/4169'
---

2a1689f9621b7ec94e4935ea11fe64a45390ef7d
diff --combined Gemfile.lock
index 847350b7a,c78172a41..774803788
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -348,6 -348,9 +348,9 @@@ GE
      omniauth-mediawiki (0.0.4)
        jwt (~> 2.0)
        omniauth-oauth (~> 1.0)
+     omniauth-microsoft_graph (1.2.0)
+       omniauth (~> 2.0)
+       omniauth-oauth2 (~> 1.8.0)
      omniauth-oauth (1.2.0)
        oauth
        omniauth (>= 1.0, < 3)
@@@ -360,9 -363,6 +363,6 @@@
      omniauth-rails_csrf_protection (1.0.1)
        actionpack (>= 4.2)
        omniauth (~> 2.0)
-     omniauth-windowslive (0.0.12)
-       multi_json (~> 1.12)
-       omniauth-oauth2 (~> 1.4)
      openstreetmap-deadlock_retry (1.3.1)
      parallel (1.23.0)
      parser (3.2.2.3)
@@@ -372,7 -372,7 +372,7 @@@
      popper_js (2.11.8)
      progress (3.6.0)
      public_suffix (5.0.3)
 -    puma (5.6.6)
 +    puma (5.6.7)
        nio4r (~> 2.0)
      quad_tile (1.0.1)
      r2 (0.2.8)
@@@ -595,9 -595,9 +595,9 @@@ DEPENDENCIE
    omniauth-github
    omniauth-google-oauth2 (>= 0.6.0)
    omniauth-mediawiki (>= 0.0.4)
+   omniauth-microsoft_graph
    omniauth-openid
    omniauth-rails_csrf_protection (~> 1.0)
-   omniauth-windowslive
    openstreetmap-deadlock_retry (>= 1.3.1)
    pg
    puma (~> 5.6)
diff --combined config/locales/en.yml
index 7635c483d,8db646d23..7b415f6b7
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -212,7 -212,7 +212,7 @@@ en
        openid: OpenID
        google: Google
        facebook: Facebook
-       windowslive: Microsoft
+       microsoft: Microsoft
        github: GitHub
        wikipedia: Wikipedia
    api:
@@@ -1785,7 -1785,7 +1785,7 @@@
          facebook:
            title: Login with Facebook
            alt: Login with a Facebook Account
-         windowslive:
+         microsoft:
            title: Login with Microsoft
            alt: Login with a Microsoft Account
          github:
@@@ -2878,9 -2878,7 +2878,9 @@@
      index:
        title: "Notes submitted or commented on by %{user}"
        heading: "%{user}'s Notes"
 -      subheading_html: "Notes submitted or commented on by %{user}"
 +      subheading_html: "Notes %{submitted} or %{commented} by %{user}"
 +      subheading_submitted: "submitted"
 +      subheading_commented: "commented on"
        no_notes: No notes
        id: "Id"
        creator: "Creator"
diff --combined config/settings.yml
index 15a5753e4,b54763af3..d9910ce28
--- a/config/settings.yml
+++ b/config/settings.yml
@@@ -39,10 -39,6 +39,10 @@@ max_number_of_way_nodes: 200
  max_number_of_relation_members: 32000
  # The maximum area you're allowed to request notes from, in square degrees
  max_note_request_area: 25
 +# Default limit on the number of notes returned by the note search api method
 +default_note_query_limit: 100
 +# Maximum limit on the number of notes returned by the note search api method
 +max_note_query_limit: 10000
  # Zoom level to use for postcode results from the geocoder
  postcode_zoom: 15
  # Timeout for API calls in seconds
@@@ -104,10 -100,10 +104,10 @@@ fossgis_valhalla_url: "https://valhalla
  #google_openid_realm: ""
  #facebook_auth_id: ""
  #facebook_auth_secret: ""
- #windowslive_auth_id: ""
- #windowslive_auth_secret: ""
  #github_auth_id: ""
  #github_auth_secret: ""
+ #microsoft_auth_id: ""
+ #microsoft_auth_secret: ""
  #wikipedia_auth_id: ""
  #wikipedia_auth_secret: ""
  # Thunderforest authentication details