diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3059d5773..f7ee886c9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -19,7 +19,7 @@ require:
# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Layout/LineLength:
- Max: 254
+ Max: 270
# Offense count: 36
# Configuration parameters: AllowSafeAssignment.
diff --git a/app/assets/images/yahoo.svg b/app/assets/images/yahoo.svg
deleted file mode 100644
index b0bbdef73..000000000
--- a/app/assets/images/yahoo.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 69ea7d8fd..fa0747c9c 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -44,7 +44,6 @@
<% if Settings.key?(:wikipedia_auth_id) -%>
<%= auth_button "wikipedia", "wikipedia" %>
<% end -%>
- <%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %>
<%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %>
<%= auth_button "aol", "openid", :openid_url => "aol.com" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 93d9fb61d..25464bdcf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1666,9 +1666,6 @@ en:
wikipedia:
title: Login with Wikipedia
alt: Login with a Wikipedia Account
- yahoo:
- title: Login with Yahoo
- alt: Login with a Yahoo OpenID
wordpress:
title: Login with Wordpress
alt: Login with a Wordpress OpenID
diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index a378ad5b0..758baa1cb 100644
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -75,8 +75,8 @@ class UserHelperTest < ActionView::TestCase
button = auth_button("google", "google")
assert_equal("
", button)
- button = auth_button("yahoo", "openid", :openid_url => "yahoo.com")
- assert_equal("
", button)
+ button = auth_button("wordpress", "openid", :openid_url => "wordpress.com")
+ assert_equal("
", button)
end
private