Merge branch 'master' into fixes/unlock-force-from-settings

Author: StanleyGoldman

src/GitHub.Api/Metrics/UsageModel.cs

@@ -25,16 +25,16 @@ public class Dimensions
     public class Measures
     {
         public int NumberOfStartups { get; set; }
-        public int NumberOfCommits { get; set; }
-        public int NumberOfFetches { get; set; }
-        public int NumberOfPushes { get; set; }
-        public int NumberOfPulls { get; set; }
-        public int NumberOfProjectsInitialized { get; set; }
-        public int NumberOfAuthentications { get; set; }
-        public int NumberOfLocalBranchCreations { get; set; }
-        public int NumberOfLocalBranchDeletion { get; set; }
-        public int NumberOfLocalBranchCheckouts { get; set; }
-        public int NumberOfRemoteBranchCheckouts { get; set; }
+        public int Commits { get; set; }
+        public int Fetches { get; set; }
+        public int Pushes { get; set; }
+        public int Pulls { get; set; }
+        public int ProjectsInitialized { get; set; }
+        public int Authentications { get; set; }
+        public int LocalBranchCreations { get; set; }
+        public int LocalBranchDeletion { get; set; }
+        public int LocalBranchCheckouts { get; set; }
+        public int RemoteBranchCheckouts { get; set; }
     }
 
     class UsageModel

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -174,7 +174,7 @@ public void IncrementNumberOfCommits()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfCommits++;
+            usage.Measures.Commits++;
 
             SaveUsage(usageStore);
         }
@@ -184,7 +184,7 @@ public void IncrementNumberOfFetches()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfFetches++;
+            usage.Measures.Fetches++;
 
             SaveUsage(usageStore);
         }
@@ -194,7 +194,7 @@ public void IncrementNumberOfPushes()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfPushes++;
+            usage.Measures.Pushes++;
 
             SaveUsage(usageStore);
         }
@@ -204,7 +204,7 @@ public void IncrementNumberOfProjectsInitialized()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfProjectsInitialized++;
+            usage.Measures.ProjectsInitialized++;
 
             SaveUsage(usageStore);
         }
@@ -214,7 +214,7 @@ public void IncrementNumberOfLocalBranchCreations()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfLocalBranchCreations++;
+            usage.Measures.LocalBranchCreations++;
 
             SaveUsage(usageStore);
         }
@@ -224,7 +224,7 @@ public void IncrementNumberOfLocalBranchDeletions()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfLocalBranchDeletion++;
+            usage.Measures.LocalBranchDeletion++;
 
             SaveUsage(usageStore);
         }
@@ -234,7 +234,7 @@ public void IncrementNumberOfLocalBranchCheckouts()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfLocalBranchCheckouts++;
+            usage.Measures.LocalBranchCheckouts++;
 
             SaveUsage(usageStore);
         }
@@ -244,7 +244,7 @@ public void IncrementNumberOfRemoteBranchCheckouts()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfRemoteBranchCheckouts++;
+            usage.Measures.RemoteBranchCheckouts++;
 
             SaveUsage(usageStore);
         }
@@ -254,7 +254,7 @@ public void IncrementNumberOfPulls()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfPulls++;
+            usage.Measures.Pulls++;
 
             SaveUsage(usageStore);
         }
@@ -264,7 +264,7 @@ public void IncrementNumberOfAuthentications()
             var usageStore = LoadUsage();
             var usage = GetCurrentUsage(usageStore);
 
-            usage.Measures.NumberOfAuthentications++;
+            usage.Measures.Authentications++;
 
             SaveUsage(usageStore);
         }