[openstreetmap/openstreetmap-website] Rename user_controller to users_controller (#2014)

Andy Allan notifications at github.com
Wed Oct 3 13:36:33 UTC 2018


Refs #1918 

@Nikerabbit This PR contains translation key renaming:

* `user.*` to `users.*`
You can view, comment on, or merge this pull request online at:

  https://github.com/openstreetmap/openstreetmap-website/pull/2014

-- Commit Summary --

  * Rename user_controller to users_controller

-- File Changes --

    M .rubocop.yml (2)
    M .rubocop_todo.yml (6)
    M app/controllers/application_controller.rb (12)
    M app/controllers/messages_controller.rb (4)
    M app/controllers/notes_controller.rb (4)
    R app/controllers/users_controller.rb (80)
    M app/helpers/changeset_helper.rb (2)
    M app/helpers/note_helper.rb (4)
    M app/helpers/user_helper.rb (6)
    M app/helpers/user_roles_helper.rb (12)
    M app/models/notifier.rb (8)
    M app/views/browse/changeset.html.erb (2)
    M app/views/changeset/_user.atom.builder (2)
    M app/views/diary_entry/show.html.erb (2)
    M app/views/layouts/_header.html.erb (6)
    R app/views/users/_api_user.builder (0)
    R app/views/users/_auth_association.html.erb (0)
    R app/views/users/_contact.html.erb (6)
    R app/views/users/_popup.html.erb (0)
    R app/views/users/_terms.html.erb (0)
    R app/views/users/_user.html.erb (4)
    R app/views/users/account.html.erb (10)
    R app/views/users/api_read.builder (0)
    R app/views/users/api_users.builder (0)
    R app/views/users/blocked.html.erb (0)
    R app/views/users/confirm.html.erb (0)
    R app/views/users/confirm_email.html.erb (0)
    R app/views/users/index.html.erb (0)
    R app/views/users/login.html.erb (4)
    R app/views/users/logout.html.erb (0)
    R app/views/users/lost_password.html.erb (0)
    R app/views/users/make_friend.html.erb (0)
    R app/views/users/new.html.erb (0)
    R app/views/users/no_such_user.html.erb (0)
    R app/views/users/remove_friend.html.erb (0)
    R app/views/users/reset_password.html.erb (0)
    R app/views/users/show.html.erb (4)
    R app/views/users/suspended.html.erb (0)
    R app/views/users/terms.html.erb (0)
    M config/locales/en.yml (2)
    M config/routes.rb (58)
    M test/controllers/changeset_controller_test.rb (8)
    M test/controllers/diary_entry_controller_test.rb (14)
    M test/controllers/messages_controller_test.rb (2)
    M test/controllers/site_controller_test.rb (4)
    M test/controllers/traces_controller_test.rb (8)
    M test/controllers/user_blocks_controller_test.rb (12)
    M test/controllers/user_roles_controller_test.rb (4)
    R test/controllers/users_controller_test.rb (88)
    M test/integration/client_applications_test.rb (6)
    M test/integration/user_changeset_comments_test.rb (2)
    M test/integration/user_creation_test.rb (60)
    M test/integration/user_diaries_test.rb (2)
    M test/integration/user_login_test.rb (118)
    M test/integration/user_roles_test.rb (4)
    M test/integration/user_terms_seen_test.rb (12)
    M test/system/issues_test.rb (2)
    M test/system/report_user_test.rb (8)

-- Patch Links --

https://github.com/openstreetmap/openstreetmap-website/pull/2014.patch
https://github.com/openstreetmap/openstreetmap-website/pull/2014.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/2014
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/rails-dev/attachments/20181003/e4ab3434/attachment-0001.html>


More information about the rails-dev mailing list