Compare commits

..
2 Commits
Author SHA1 Message Date
Danil Kislov 2c1e396502 Не трогаем RemainEstimate 2019-06-27 17:04:29 +03:00
Danil Kislov 7933ca244c Исправлен пропуск close веток 2019-06-27 14:02:29 +03:00
4 changed files with 36 additions and 36 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.53 1.0.55
+2 -2
View File
@@ -146,7 +146,7 @@ namespace JiraTimeBot.JiraIntegration
{ {
try try
{ {
issue.DeleteWorklogAsync(workLog, token: cancellationToken); issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -172,7 +172,7 @@ namespace JiraTimeBot.JiraIntegration
{ {
try try
{ {
workLogToAdd = issue.AddWorklogAsync(workLogToAdd, token: cancellationToken).Result; workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken).Result;
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -12,8 +12,8 @@ namespace JiraTimeBot.Mercurial.Modifiers
} }
//Пропускаем Close и Merge коммиты //Пропускаем Close и Merge коммиты
if (commitMessage.StartsWith($"Close {branch} ", StringComparison.InvariantCultureIgnoreCase) || if (commitMessage.StartsWith($"Close {branch}", StringComparison.InvariantCultureIgnoreCase) ||
commitMessage.StartsWith($"Merge with ", StringComparison.InvariantCultureIgnoreCase)) commitMessage.StartsWith($"Merge with", StringComparison.InvariantCultureIgnoreCase))
{ {
return true; return true;
} }
+3 -3
View File
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.53")] [assembly: AssemblyVersion("1.0.55")]
[assembly: AssemblyFileVersion("1.0.53")] [assembly: AssemblyFileVersion("1.0.55")]
[assembly: AssemblyInformationalVersion("1.0.53")] [assembly: AssemblyInformationalVersion("1.0.55")]