Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/Piwigo/Piwigo

  • Loading branch information...
modus75 committed Dec 9, 2016
2 parents 25e2954 + 806a3b7 commit 9b6ec85f090cf7afd503c0ae813475f223c864dd
Showing with 4 additions and 4 deletions.
  1. +3 −3 admin/themes/default/template/user_list.tpl
  2. +1 −1 include/ws_functions/pwg.php
@@ -93,7 +93,7 @@ jQuery(document).ready(function() {
jQuery("#addUserForm .loading").show();
},
success:function(data) {
oTable.draw();
oTable.api().draw();
jQuery("#addUserForm .loading").hide();
var data = jQuery.parseJSON(data);
@@ -584,7 +584,7 @@ jQuery(document).on('click', '.close-user-details', function(e) {
title:"{/literal}{'Edit user'|translate}{literal}",
href:".user_form_popin",
onClosed: function() {
oTable.draw();
oTable.api().draw();
}
});

@@ -825,7 +825,7 @@ jQuery(document).on('click', '.close-user-details', function(e) {
jQuery("#applyActionLoading").show();
},
success:function(data) {
oTable.draw();
oTable.api().draw();
jQuery("#applyActionLoading").hide();
jQuery("#applyActionBlock .infos").show();
@@ -327,7 +327,7 @@ function ws_session_getStatus($params, &$service)
list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
$res['current_datetime'] = $dbnow;
$res['version'] = PHPWG_VERSION;
$res['available_sizes'] = implode(',', array_keys(ImageStdParams::get_defined_type_map()));
$res['available_sizes'] = array_keys(ImageStdParams::get_defined_type_map());
if (is_admin())
{

7 comments on commit 9b6ec85

@plegall

This comment has been minimized.

Copy link
Member

replied Dec 9, 2016

@modus75 this merge looks a lot like an automatic "git pull" with local commits on master, ie a conflict in the commit history. When pulling, to avoid these merges, it would be better to "fetch + rebase". See https://medium.com/@porteneuve/getting-solid-at-git-rebase-vs-merge-4fa1a48c53aa#5f53

This commit has been pushed on Github, so let's keep it, it is highly "not recommended" to modify history once pushed on remote.

@plegall

This comment has been minimized.

Copy link
Member

replied Dec 9, 2016

cc @moy

@modus75

This comment has been minimized.

Copy link
Contributor Author

replied Dec 10, 2016

@moy

This comment has been minimized.

Copy link

replied Dec 10, 2016

Note: "fetch + rebase" can also be done with git pull --rebase. You can make this your way of life by setting pull.rebase to true (you probably want this on a per-repo basis, hence in .git/config).

The case described in https://medium.com/@porteneuve/getting-solid-at-git-rebase-vs-merge-4fa1a48c53aa#.duwmfylgv happens mostly for weird workflows: I don't remember ever having done a local merge that I needed to push upstream as a merge commit. If your flow is just "work; pull; push", with "work" not including complex multi-branch stuff, you don't need to worry about --preverve-merge: first, you won't have local merge commits, and if you do, it's just because you pull --no-rebase by mistake and you're happy that pull --rebase flattens this merge commit.

@modus75

This comment has been minimized.

Copy link
Contributor Author

replied Dec 12, 2016

@moy

This comment has been minimized.

Copy link

replied Dec 12, 2016

I never used Tortoise Git, so I can't help here unfortunately.

@plegall

This comment has been minimized.

Copy link
Member

replied Dec 12, 2016

It's not perfectly clear for me, so I will read more on it and I hope I manage to do it right next time when needed.

No worry, Git is much more complicated than SVN to manage concurrency. With some time we will manage it the right way :-)

Please sign in to comment.
You can’t perform that action at this time.