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

Move collation connection setting to user preferences #13847

Merged
merged 1 commit into from Nov 29, 2017

Conversation

Projects
None yet
1 participant
@nijel
Member

nijel commented Nov 29, 2017

It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař michal@cihar.com

Before submitting pull request, please check that every commit:

  • Has proper Signed-Off-By
  • Has commit message which describes it
  • Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
  • Any new functionality is covered by tests

@nijel nijel added this to the 4.8.0 milestone Nov 29, 2017

@nijel nijel self-assigned this Nov 29, 2017

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Nov 29, 2017

Codecov Report

Merging #13847 into master will increase coverage by 0.02%.
The diff coverage is 35.41%.

@@            Coverage Diff             @@
##           master   #13847      +/-   ##
==========================================
+ Coverage   53.85%   53.87%   +0.02%     
==========================================
  Files         493      493              
  Lines       81043    80982      -61     
==========================================
- Hits        43642    43632      -10     
+ Misses      37401    37350      -51

codecov bot commented Nov 29, 2017

Codecov Report

Merging #13847 into master will increase coverage by 0.02%.
The diff coverage is 35.41%.

@@            Coverage Diff             @@
##           master   #13847      +/-   ##
==========================================
+ Coverage   53.85%   53.87%   +0.02%     
==========================================
  Files         493      493              
  Lines       81043    80982      -61     
==========================================
- Hits        43642    43632      -10     
+ Misses      37401    37350      -51
Move collation connection setting to user preferences
It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>

@nijel nijel merged commit 6a0345b into phpmyadmin:master Nov 29, 2017

4 of 5 checks passed

codecov/patch 35.41% of diff hit (target 53.85%)
Details
DCO All commits have a DCO sign-off from the author
Scrutinizer Analysis: 1 new issues, 9 updated code elements – Tests: passed
Details
codecov/project 53.87% (+0.02%) compared to 63f5b90
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@nijel nijel deleted the nijel:collation branch Nov 29, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment