From: Tom Hughes Date: Sun, 22 May 2022 17:32:22 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/3554' X-Git-Tag: live~1212 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dd676f2257f442d427e0bce4c2984fb5e3488f62?hp=437f0cd3ff44449eb3de4d3e81a89fd7296ebb8e Merge remote-tracking branch 'upstream/pull/3554' --- diff --git a/app/assets/images/aol.svg b/app/assets/images/aol.svg deleted file mode 100644 index 53c4dadb7..000000000 --- a/app/assets/images/aol.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/wordpress.svg b/app/assets/images/wordpress.svg deleted file mode 100644 index d4ff7f03d..000000000 --- a/app/assets/images/wordpress.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 9be87b0e5..18f536206 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -44,8 +44,6 @@ <% if Settings.key?(:wikipedia_auth_id) -%>
  • <%= auth_button "wikipedia", "wikipedia" %>
    • <% end -%> -
  • <%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %>
    • -
  • <%= auth_button "aol", "openid", :openid_url => "aol.com" %>
    • <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %> diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 43a10c02b..84ca47bf3 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -1234,7 +1234,7 @@ lb: health_food: Naturkaschtbuttek hearing_aids: Hörapparat herbalist: Kraiderhandel - hifi: Elektroshop + hifi: Hi-Fi-Geschäft houseware: Houswuerebuttek ice_cream: Glacëbuttek interior_decoration: Bannenausstattung diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index 11a47a195..f64cee319 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -117,9 +117,6 @@ class UserHelperTest < ActionView::TestCase def test_auth_button button = auth_button("google", "google") assert_equal("\"Login", button) - - button = auth_button("wordpress", "openid", :openid_url => "wordpress.com") - assert_equal("\"Login", button) end private diff --git a/yarn.lock b/yarn.lock index 4d1958121..98e8d3fcf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,15 +2,15 @@ # yarn lockfile v1 -"@eslint/eslintrc@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886" - integrity sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA== +"@eslint/eslintrc@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" + integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== dependencies: ajv "^6.12.4" debug "^4.3.2" espree "^9.3.2" - globals "^13.9.0" + globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -189,11 +189,11 @@ eslint-visitor-keys@^3.3.0: integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint@^8.0.0: - version "8.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.15.0.tgz#fea1d55a7062da48d82600d2e0974c55612a11e9" - integrity sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA== + version "8.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.16.0.tgz#6d936e2d524599f2a86c708483b4c372c5d3bbae" + integrity sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA== dependencies: - "@eslint/eslintrc" "^1.2.3" + "@eslint/eslintrc" "^1.3.0" "@humanwhocodes/config-array" "^0.9.2" ajv "^6.10.0" chalk "^4.0.0" @@ -211,7 +211,7 @@ eslint@^8.0.0: file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^6.0.1" - globals "^13.6.0" + globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -345,10 +345,10 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -globals@^13.6.0, globals@^13.9.0: - version "13.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" - integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== +globals@^13.15.0: + version "13.15.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac" + integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog== dependencies: type-fest "^0.20.2"