Merge branch 'sh-fix-typo-in-protected-branches-usage' into 'master'

Fix typo in protected_branches usage data See merge request !758

Merge branch 'sh-fix-typo-in-protected-branches-usage' into 'master'
Fix typo in protected_branches usage data See merge request !758
cf3f2049 · Rubén Dávila Santos · Ruben Davila · 0f11e122 · cf3f2049 · cf3f2049
Commit cf3f2049 authored Sep 23, 2016 by Rubén Dávila Santos Committed by Ruben Davila Sep 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lib/gitlab/usage_data.rb lib/gitlab/usage_data.rb +1 -1

spec/lib/gitlab/usage_data_spec.rb spec/lib/gitlab/usage_data_spec.rb +1 -1

No files found.
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -39,7 +39,7 @@ module Gitlab
            pushes: Event.code_push.count,
            pages_domains: PagesDomain.count,
            projects: Project.count,
-            protected_branchess: ProtectedBranch.count,
+            protected_branches: ProtectedBranch.count,
            releases: Release.count,
            remote_mirrors: RemoteMirror.count,
            services: Service.where(active: true).count,

--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -54,7 +54,7 @@ describe Gitlab::UsageData do
        projects
        pushes
        pages_domains
-        protected_branchess
+        protected_branches
        releases
        remote_mirrors
        services