Skip to content

Conversation

@MorrisJobke
Copy link
Member

  • fix the show password button on the personal page
  • before: if the password change failed the show password icon was not shown again
  • after: show password icon is visible
  • regression from Bugfix/change password changes #1229

Should be backported at least to stable12.

* fix the show password button on the personal page
* before: if the password change failed the show password icon was not shown again
* after: show password icon is visible

Signed-off-by: Morris Jobke <[email protected]>
@ArtificialOwl
Copy link
Member

file is settings/js/personal.js in stable12

@MorrisJobke
Copy link
Member Author

stable12: #5896

@MorrisJobke
Copy link
Member Author

file is settings/js/personal.js in stable12

Git is smart enough to figure this out in a simple cherry pick 😉

@ArtificialOwl
Copy link
Member

I really need to learn how to use this tool

@MorrisJobke
Copy link
Member Author

MorrisJobke commented Jul 26, 2017

I really need to learn how to use this tool

git checkout stable12
git checkout -b backport-NUMBER
git cherry-pick <commit-sha>
git push origin backport-NUMBER

@oparoz
Copy link
Member

oparoz commented Jul 27, 2017

Also very easy using tools like PHPStorm where you can pick, merge, fix, commit

@MorrisJobke MorrisJobke merged commit 63aa12e into master Jul 27, 2017
@MorrisJobke MorrisJobke deleted the fix-password-change branch July 27, 2017 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants