https://www.redmine.org/https://www.redmine.org/favicon.ico?16793021292015-08-01T08:11:35ZRedmineRedmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=652362015-08-01T08:11:35ZMischa The Evil
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/65236/diff?detail_id=50078">diff</a>)</li></ul> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=652372015-08-01T08:12:20ZMischa The Evil
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/65237/diff?detail_id=50079">diff</a>)</li></ul> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=652382015-08-01T08:13:08ZMischa The Evil
<ul><li><strong>Related to</strong> <i><a class="issue tracker-2 status-5 priority-4 priority-default closed" href="/issues/11253">Feature #11253</a>: Total time spent from subtasks on the issue list</i> added</li></ul> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=652422015-08-01T11:15:51ZToshi MARUYAMA
<ul><li><strong>Description</strong> updated (<a title="View differences" href="/journals/65242/diff?detail_id=50082">diff</a>)</li></ul> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=652432015-08-01T11:44:34ZToshi MARUYAMA
<ul></ul><p>Thank you for investigation. I will answer my revisions later.</p>
<blockquote>
<p>If SCM-provided merge tracking features are used and maintained correctly</p>
</blockquote>
<p>I almost agree, but SCM is not completed solution.</p>
<p>Rails uses git.<br /><a class="external" href="https://github.com/rails/rails">https://github.com/rails/rails</a><br />But Rails uses "backport/cherry-pick" model.<br /><a class="external" href="https://github.com/rails/rails/pull/19689">https://github.com/rails/rails/pull/19689</a></p>
<ol>
<li>Revision is committed in master branch.<br /> <a class="external" href="https://github.com/rails/rails/commit/7e504927090362d132d4e315c6f22915050fe5ba">https://github.com/rails/rails/commit/7e504927090362d132d4e315c6f22915050fe5ba</a></li>
<li>This master revision is backported in 4.2-stable branch.<br /> <a class="external" href="https://github.com/rails/rails/commit/4df216cb12e35c09ae5ec271755e581d692d0326">https://github.com/rails/rails/commit/4df216cb12e35c09ae5ec271755e581d692d0326</a></li>
</ol>
<p>If they use Git/Mercurial, they should use stable/devel merge strategy.<br /><a class="external" href="http://marutosi.bitbucket.org/RxTstudy-20130622/one-html/html/index.html#id252">http://marutosi.bitbucket.org/RxTstudy-20130622/one-html/html/index.html#id252</a></p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=657142015-08-31T03:42:26ZToshi MARUYAMA
<ul></ul><blockquote>
<p><a class="changeset" title="Use shorter syntax for admin routes." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14390">r14390</a>, <a class="changeset" title="Adds a named route for test email." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14391">r14391</a>,<br />--->>> NOT EXPLICIT 3.1.0, BUT IT WAS PROBABLY INTENDED FOR 3.1.X THOUGH</p>
</blockquote>
<p>I think this is refactoring and not for stable.</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=657152015-08-31T03:43:09ZToshi MARUYAMA
<ul><li><strong>Target version</strong> set to <i>3.1.1</i></li></ul> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=657212015-08-31T05:25:25ZToshi MARUYAMA
<ul></ul><blockquote>
<p><a class="changeset" title="[js-cleanup] add short copyright notices to javascripts and remove superfluous newline (#20240). ..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14411">r14411</a>, <a class="changeset" title="Replace tab introduced in r14388 in test/test_helper.rb with spaces (#20242). Patch by Mischa Th..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14412">r14412</a>, <a class="changeset" title="Use https links instead of http links in ApplicationHelper#avatar_edit_link and Redmine::Info cla..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14413">r14413</a>, <a class="changeset" title="Replace tabs with two spaces in jstoolbar scripts (#20241). Patch by Mischa The Evil." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14414">r14414</a>, <br />--->>> UNKNOWN, CAN BE BACK-PORTED TO 3.1: "CODE (LAYOUT) CLEANUP & HTTP => HTTPS"</p>
</blockquote>
<p>I have merged <a class="changeset" title="Use https links instead of http links in ApplicationHelper#avatar_edit_link and Redmine::Info cla..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14413">r14413</a> from trunk to 3.1-stable.<br />I think <a class="changeset" title="[js-cleanup] add short copyright notices to javascripts and remove superfluous newline (#20240). ..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14411">r14411</a>, <a class="changeset" title="Replace tab introduced in r14388 in test/test_helper.rb with spaces (#20242). Patch by Mischa Th..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14412">r14412</a> and <a class="changeset" title="Replace tabs with two spaces in jstoolbar scripts (#20241). Patch by Mischa The Evil." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14414">r14414</a> are refactoring and not for stable.</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=657222015-08-31T05:29:33ZToshi MARUYAMA
<ul></ul><blockquote>
<p><a class="changeset" title="travis: allow ui test failure on postgresql (#20251)" href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14415">r14415</a>, <a class="changeset" title="travis: show postgresql information" href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14416">r14416</a>, <br />--->>> UNKNOWN, MIGHT BE BACK-PORTABLE TO 3.1: "TRAVIS CHANGES, <a class="issue tracker-1 status-5 priority-4 priority-default closed" title="Defect: test/ui/timelog_test_ui.rb always fail on trunk (Closed)" href="https://www.redmine.org/issues/20251">#20251</a>"</p>
</blockquote>
<p><a class="changeset" title="travis: allow ui test failure on postgresql (#20251)" href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14415">r14415</a> was merged as <a class="changeset" title="Merged r14415 and r14522 from trunk to 3.1-stable (#20251) travis: allow ui test failure. Refer..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14523">r14523</a>.<br /><a class="changeset" title="travis: show postgresql information" href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14416">r14416</a> was merged as <a class="changeset" title="Merged r14416 and r14530 from trunk to 3.1-stable travis: add PostgreSQL environments" href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14531">r14531</a>.</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=657232015-08-31T05:33:39ZToshi MARUYAMA
<ul></ul><blockquote>
<p>--> <a class="changeset" title="Bulgarian translation order sorted by Ivan Cenov (#20321)" href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14454">r14454</a>, <br />--->>> EXPLICIT 3.1.0, "BG LOCALE REORDER", <a class="issue tracker-2 status-5 priority-4 priority-default closed" title="Feature: Total time spent from subtasks on the issue list (Closed)" href="https://www.redmine.org/issues/11253">#11253</a> AND RELATED</p>
</blockquote>
<p>Bulgarian translation is well maintained.<br /><a class="issue tracker-2 status-5 priority-4 priority-default closed" title="Feature: Total time spent from subtasks on the issue list (Closed)" href="https://www.redmine.org/issues/11253">#11253</a> translation is merged as <a class="changeset" title="Merged r14406 from trunk to 3.1-stable (#11253, #20456) Adds "Total spent hours" column availabl..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14533">r14533</a>.</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=657242015-08-31T05:36:15ZToshi MARUYAMA
<ul><li><strong>Status</strong> changed from <i>New</i> to <i>Resolved</i></li></ul><p>I have finished checking revisions in description.</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=657602015-09-02T01:20:56ZRyosuke Hirai
<ul></ul><p>Mischa and Toshi, <br />Thank you so much for your dedicated work on this issue!, especially Mischa's deep investigation</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=659972015-09-13T14:29:22ZJean-Philippe Langjp_lang@yahoo.fr
<ul><li><strong>Assignee</strong> set to <i>Toshi MARUYAMA</i></li></ul><p>Mischa and Toshi, thanks for your respective work. Can we close this for 3.1.1?</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=660302015-09-15T04:14:47ZMischa The Evil
<ul><li><strong>Status</strong> changed from <i>Resolved</i> to <i>Needs feedback</i></li></ul><p>Jean-Philippe Lang wrote:</p>
<blockquote>
<p>[...] Can we close this for 3.1.1?</p>
</blockquote>
<p>Toshi MARUYAMA wrote:</p>
<blockquote>
<p>I have finished checking revisions in description.</p>
</blockquote>
<p>Toshi, thanks for the review. I'm ok with your decisions and merges. One question though: did you skip <a class="changeset" title="Don't display estimated hours when nil and total is 0." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14405">r14405</a> for any particular reason? After decision/action is taken on <a class="changeset" title="Don't display estimated hours when nil and total is 0." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14405">r14405</a> this issue is completed and can be closed for 3.1.1 inclusion.<br />Note: please mention the inclusion of <a class="issue tracker-2 status-5 priority-4 priority-default closed" title="Feature: Total time spent from subtasks on the issue list (Closed)" href="https://www.redmine.org/issues/11253">#11253</a> in 3.1.1 instead of 3.1.0 in the 3.1.1 release announcement and changelog entry, since it's now showing on the changelog as part of 3.1.0.</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=660402015-09-16T04:24:08ZToshi MARUYAMA
<ul><li><strong>Status</strong> changed from <i>Needs feedback</i> to <i>Resolved</i></li><li><strong>Assignee</strong> changed from <i>Toshi MARUYAMA</i> to <i>Jean-Philippe Lang</i></li></ul><p>Mischa The Evil wrote:</p>
<blockquote>
<p>Jean-Philippe Lang wrote:</p>
<blockquote>
<p>[...] Can we close this for 3.1.1?</p>
</blockquote>
<p>Toshi MARUYAMA wrote:</p>
<blockquote>
<p>I have finished checking revisions in description.</p>
</blockquote>
<p>Toshi, thanks for the review. I'm ok with your decisions and merges. One question though: did you skip <a class="changeset" title="Don't display estimated hours when nil and total is 0." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14405">r14405</a> for any particular reason?</p>
</blockquote>
<p>There is no reason. I forgot it.</p>
<blockquote>
<p>Note: please mention the inclusion of <a class="issue tracker-2 status-5 priority-4 priority-default closed" title="Feature: Total time spent from subtasks on the issue list (Closed)" href="https://www.redmine.org/issues/11253">#11253</a> in 3.1.1 instead of 3.1.0 in the 3.1.1 release announcement and changelog entry, since it's now showing on the changelog as part of 3.1.0.</p>
</blockquote>
<p>I keep open for JPL reminder.</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=660412015-09-16T04:25:22ZToshi MARUYAMA
<ul></ul><p>Toshi MARUYAMA wrote:</p>
<blockquote>
<p>Mischa The Evil wrote:</p>
<blockquote>
<p>Jean-Philippe Lang wrote:</p>
<blockquote>
<p>[...] Can we close this for 3.1.1?</p>
</blockquote>
<p>Toshi MARUYAMA wrote:</p>
<blockquote>
<p>I have finished checking revisions in description.</p>
</blockquote>
<p>Toshi, thanks for the review. I'm ok with your decisions and merges. One question though: did you skip <a class="changeset" title="Don't display estimated hours when nil and total is 0." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14405">r14405</a> for any particular reason?</p>
</blockquote>
<p>There is no reason. I forgot it.</p>
</blockquote>
<p>I have merged as <a class="changeset" title="Merged r14405 from trunk to 3.1-stable (#11253, #20456) Don't display estimated hours when nil a..." href="https://www.redmine.org/projects/redmine/repository/svn/revisions/14596">r14596</a>.</p> Redmine - Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)https://www.redmine.org/issues/20456?journal_id=660972015-09-19T07:30:55ZJean-Philippe Langjp_lang@yahoo.fr
<ul><li><strong>Status</strong> changed from <i>Resolved</i> to <i>Closed</i></li><li><strong>Resolution</strong> set to <i>Fixed</i></li></ul><p>Thanks.</p>