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

Extracts HTML from UserPassword.php to twig template #14801 #15610

Merged
merged 1 commit into from Dec 6, 2019

Conversation

victorphoenix3
Copy link
Contributor

Signed-off-by: Jayati Shrivastava gaurijove@gmail.com

This PR is for extracting HTML from the UserPassword.php to a twig template and continues the work on #14801 .

Before submitting pull request, please review the following checklist:

  • Make sure you have read our CONTRIBUTING.md document.
  • Make sure you are making a pull request against the correct branch. For example, for bug fixes in a released version use the corresponding QA branch and for new features use the master branch. If you have a doubt, you can ask as a comment in the bug report or on the mailing list.
  • Every commit has proper Signed-off-by line as described in our DCO. This ensures that the work you're submitting is your own creation.
  • Every commit has a descriptive commit message.
  • Every commit is needed on its own, if you have just minor fixes to previous commits, you can squash them.
  • Any new functionality is covered by tests.

@codecov
Copy link

codecov bot commented Dec 3, 2019

Codecov Report

Merging #15610 into master will increase coverage by <.01%.
The diff coverage is 0%.

@@             Coverage Diff              @@
##             master   #15610      +/-   ##
============================================
+ Coverage     52.96%   52.96%   +<.01%     
  Complexity    14096    14096              
============================================
  Files           475      475              
  Lines         61290    61289       -1     
============================================
  Hits          32463    32463              
+ Misses        28827    28826       -1

@victorphoenix3
Copy link
Contributor Author

@williamdes This is my first PR. I do not understand why its failing the tests.

Copy link
Member

@MauricioFauth MauricioFauth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi. Thanks for your contribution.

templates/UserPassword.twig Outdated Show resolved Hide resolved
@williamdes
Copy link
Member

@williamdes This is my first PR. I do not understand why its failing the tests.

For now the selenium tests can fail for strange reasons (#15154), just do as if they where not failing ;)

Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
@victorphoenix3
Copy link
Contributor Author

@MauricioFauth I have made the required changes.

@williamdes williamdes added enhancement A feature request for improving phpMyAdmin ui Issues relating to the user interface labels Dec 4, 2019
@williamdes williamdes added this to In progress in pull-requests via automation Dec 4, 2019
@williamdes williamdes moved this from In progress to To merge in pull-requests Dec 4, 2019
@williamdes williamdes added this to the 5.1.0 milestone Dec 4, 2019
pull-requests automation moved this from To merge to Reviewer approved Dec 6, 2019
@MauricioFauth MauricioFauth merged commit 6de39e9 into phpmyadmin:master Dec 6, 2019
pull-requests automation moved this from Reviewer approved to Done Dec 6, 2019
@MauricioFauth
Copy link
Member

Merged, thanks for your contribution!

@MauricioFauth MauricioFauth self-assigned this Dec 6, 2019
@victorphoenix3 victorphoenix3 deleted the first branch December 7, 2019 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement A feature request for improving phpMyAdmin ui Issues relating to the user interface
Projects
pull-requests
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants