Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redirect to PasswordController#new when reset_password_token is invalid #4506

Merged
merged 1 commit into from Aug 3, 2017
Merged

Redirect to PasswordController#new when reset_password_token is invalid #4506

merged 1 commit into from Aug 3, 2017

Conversation

nullkal
Copy link
Contributor

@nullkal nullkal commented Aug 3, 2017

It is more intuitive for users to redirect to PasswordController#new when the token is invalid.

Ref: #4502

@Gargron Gargron merged commit dfcd283 into mastodon:master Aug 3, 2017
pfigel added a commit to pfigel/mastodon that referenced this pull request Aug 7, 2017
* tag 'v1.5.1': (25 commits)
  Bump to 1.5.1
  i18n: update Persian translation (mastodon#4540)
  Fix mastodon#4531 (mastodon#4533)
  fr.yml update (mastodon#4531)
  Translate 'Signed in as' into Japanese (mastodon#4530)
  l10n OC - Added  mastodon#4523 "signed in as" (mastodon#4529)
  fix columns_area.js (mastodon#4528)
  Update goldfinger to 2.0.1, see mastodon/goldfinger#5 (mastodon#4527)
  Add "signed in as" header to some pages (mastodon#4523)
  l10n update Occitan (mastodon#4522)
  Scroll columns area to right when children property is changed (mastodon#4517)
  Fix some mistakes in Polish translation (mastodon#4495)
  Ignore some locale keys that can but do not need to be translated (mastodon#4515)
  Dutch strings: typo (mastodon#4489)
  Use GNU libiconv in Nokogiri (mastodon#4494)
  i18n: Update Polish translation (mastodon#4479)
  Enable cache for babel-loader (mastodon#4505)
  Redirect to PasswordController#new when reset_password_token is invalid (mastodon#4506)
  make number of comparison in emojify() fewer (mastodon#4500)
  Don't normalize invalid domain names (mastodon#4499)
  ...
@nullkal nullkal deleted the redirect_new_when_reset_password_token_is_invalid branch August 17, 2017 10:21
Gargron pushed a commit that referenced this pull request Aug 23, 2017
…4665)

* Add Japanese translations for #2758, #4506, #4521, #4600 and #4664

* Do not translate Inbox URL and Outbox URL

* Remove "あなたの"

* Remove "あなたの"
lindwurm pushed a commit to akane-blue/mastodon that referenced this pull request Aug 27, 2017
…4521, mastodon#4600 and mastodon#4664 (mastodon#4665)

* Add Japanese translations for mastodon#2758, mastodon#4506, mastodon#4521, mastodon#4600 and mastodon#4664

* Do not translate Inbox URL and Outbox URL

* Remove "あなたの"

* Remove "あなたの"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants