From 883cae9c25695413365b44e09bc1e4e3c99abb32 Mon Sep 17 00:00:00 2001 From: "d.kislov" Date: Wed, 1 Apr 2020 16:01:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BF=D1=83=D1=81=D0=BA?= =?UTF-8?q?=D0=B0=D0=B5=D0=BC=20=D1=81=D0=B8=D0=BD=D0=BA=20=D1=81=20=D0=BC?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D0=B5=D1=80=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .semver.txt | 2 +- .../Mercurial/Modifiers/CommitSkipper.cs | 1 + src/JiraTimeBot/Properties/AssemblyInfo.cs | 62 +++++++++---------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.semver.txt b/.semver.txt index e9acec7..e7468c7 100644 --- a/.semver.txt +++ b/.semver.txt @@ -1 +1 @@ -1.0.75 +1.0.76 diff --git a/src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs b/src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs index 132a7b9..206265e 100644 --- a/src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs +++ b/src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs @@ -19,6 +19,7 @@ namespace JiraTimeBot.Mercurial.Modifiers //Пропускаем Close и Merge коммиты if (commitMessage.StartsWith($"Close {branch}", StringComparison.InvariantCultureIgnoreCase) || commitMessage.StartsWith($"Merge with", StringComparison.InvariantCultureIgnoreCase) || + commitMessage.StartsWith($"Merged master into", StringComparison.InvariantCultureIgnoreCase) || commitMessage.StartsWith($"Merge branch", StringComparison.InvariantCultureIgnoreCase)) { return true; diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index e1e91ab..afc0b4a 100644 --- a/src/JiraTimeBot/Properties/AssemblyInfo.cs +++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs @@ -1,31 +1,31 @@ -using System.Reflection; -using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("JiraTimeBot")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("JiraTimeBot")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.75")] -[assembly: AssemblyFileVersion("1.0.75")] -[assembly: AssemblyInformationalVersion("1.0.75")] +using System.Reflection; +using System.Runtime.InteropServices; +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("JiraTimeBot")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("JiraTimeBot")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.76")] +[assembly: AssemblyFileVersion("1.0.76")] +[assembly: AssemblyInformationalVersion("1.0.76")]