Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 1 deletions

diff --git a/app/services/design_management/save_designs_service.rb b/app/services/design_management/save_designs_service.rb
index 8dcc678e87e..c26d2e7ab47 100644
--- a/app/services/design_management/save_designs_service.rb
+++ b/app/services/design_management/save_designs_service.rb
@@ -66,7 +66,7 @@ module DesignManagement
 
       action = new_file?(design) ? :create : :update
       on_success do
-        ::Gitlab::UsageDataCounters::DesignsCounter.count(action)
+        track_usage_metrics(action)
       end
 
       DesignManagement::DesignAction.new(design, action, content)
@@ -128,6 +128,16 @@ module DesignManagement
         end
       end
     end
+
+    def track_usage_metrics(action)
+      if action == :update
+        ::Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_designs_modified_action(author: current_user)
+      else
+        ::Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_designs_added_action(author: current_user)
+      end
+
+      ::Gitlab::UsageDataCounters::DesignsCounter.count(action)
+    end
   end
 end