summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjejacks0n <jjackson@gitlab.com>2019-08-08 10:36:54 -0600
committerjejacks0n <jjackson@gitlab.com>2019-08-13 14:14:59 -0600
commita63184397abef5af1b900c4ecf9a446dd32e06c9 (patch)
tree4928ef4f1bb15b58990269ed584ef9f9d212bb85
parentc8545e62b4c74cdba63dbbd900bdcd898044b73b (diff)
downloadgitlab-ce-a63184397abef5af1b900c4ecf9a446dd32e06c9.tar.gz
Remove an override that’s not required
-rw-r--r--.haml-lint_todo.yml2
-rw-r--r--app/helpers/tracking_helper.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index 23036612d39..d29cb8aa0b0 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -27,7 +27,7 @@ linters:
- 'app/views/admin/application_settings/_repository_check.html.haml'
- 'app/views/admin/application_settings/_repository_storage.html.haml'
- 'app/views/admin/application_settings/_signin.html.haml'
- - 'app/views/admin/application_settings/_snowplow.html.haml'
+ - 'app/views/admin/application_settings/_signup.html.haml'
- 'app/views/admin/application_settings/_spam.html.haml'
- 'app/views/admin/application_settings/_terminal.html.haml'
- 'app/views/admin/application_settings/_usage.html.haml'
diff --git a/app/helpers/tracking_helper.rb b/app/helpers/tracking_helper.rb
index 4de1aad364a..4f5812a49fb 100644
--- a/app/helpers/tracking_helper.rb
+++ b/app/helpers/tracking_helper.rb
@@ -3,8 +3,6 @@
module TrackingHelper
extend ::Gitlab::Utils::Override
- override :tracking_attrs
-
def tracking_attrs(label, event, property)
return {} unless tracking_enabled?