diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-14 20:53:07 +0300 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-14 20:53:07 +0300 |
commit | df905b408017e208a15597fb03a684f6a68d5e5f (patch) | |
tree | 2a0c3ec9bc6306f5743a2c92c5c592ab7a29b556 /app | |
parent | 51f40bf9715a29a29e4b08b8175935c6e261fcda (diff) |
Revert "Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' into 'master'"
This reverts merge request !30808
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/main.js | 2 | ||||
-rw-r--r-- | app/helpers/user_callouts_helper.rb | 6 | ||||
-rw-r--r-- | app/models/user_callout_enums.rb | 3 | ||||
-rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/_privacy_policy_update_callout.html.haml | 6 |
5 files changed, 1 insertions, 18 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 74497945dee..9e97f345717 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -32,7 +32,6 @@ import initSearchAutocomplete from './search_autocomplete'; import GlFieldErrors from './gl_field_errors'; import initUserPopovers from './user_popovers'; import { __ } from './locale'; -import initPrivacyPolicyUpdateCallout from './privacy_policy_update_callout'; import 'ee_else_ce/main_ee'; @@ -80,7 +79,6 @@ function deferredInitialisation() { initLogoAnimation(); initUsagePingConsent(); initUserPopovers(); - initPrivacyPolicyUpdateCallout(); if (document.querySelector('.search')) initSearchAutocomplete(); diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb index 0ff18d0039f..d5e459311f7 100644 --- a/app/helpers/user_callouts_helper.rb +++ b/app/helpers/user_callouts_helper.rb @@ -4,8 +4,6 @@ module UserCalloutsHelper GKE_CLUSTER_INTEGRATION = 'gke_cluster_integration'.freeze GCP_SIGNUP_OFFER = 'gcp_signup_offer'.freeze SUGGEST_POPOVER_DISMISSED = 'suggest_popover_dismissed'.freeze - # Privacy Policy Update: https://gitlab.com/gitlab-org/gitlab-ce/issues/64341 - PRIVACY_POLICY_UPDATE_64341 = 'privacy_policy_update_64341'.freeze def show_gke_cluster_integration_callout?(project) can?(current_user, :create_cluster, project) && @@ -27,10 +25,6 @@ module UserCalloutsHelper !user_dismissed?(SUGGEST_POPOVER_DISMISSED) end - def show_privacy_policy_update_64341? - !user_dismissed?(PRIVACY_POLICY_UPDATE_64341) - end - private def user_dismissed?(feature_name) diff --git a/app/models/user_callout_enums.rb b/app/models/user_callout_enums.rb index 5ad27958f4f..7b68e5076c7 100644 --- a/app/models/user_callout_enums.rb +++ b/app/models/user_callout_enums.rb @@ -14,8 +14,7 @@ module UserCalloutEnums gke_cluster_integration: 1, gcp_signup_offer: 2, cluster_security_warning: 3, - suggest_popover_dismissed: 9, - privacy_policy_update_64341: 10 # Privacy Policy Update: https://gitlab.com/gitlab-org/gitlab-ce/issues/64341 + suggest_popover_dismissed: 9 } end end diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index f32757ebc51..006334ade07 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -17,6 +17,4 @@ .d-flex %div{ class: "#{(container_class unless @no_container)} #{@content_class}" } .content{ id: "content-body" } - - if Gitlab.com? && show_privacy_policy_update_64341? - = render "layouts/privacy_policy_update_callout" = yield diff --git a/app/views/layouts/_privacy_policy_update_callout.html.haml b/app/views/layouts/_privacy_policy_update_callout.html.haml deleted file mode 100644 index 9475c48fcd5..00000000000 --- a/app/views/layouts/_privacy_policy_update_callout.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -- privacy_policy_link = link_to('https://about.gitlab.com/privacy', 'https://about.gitlab.com/privacy', class: 'deferred-link', target: '_blank', rel: 'noopener noreferrer') -%div{ class:"#{(container_class unless fluid_layout)} #{@content_class}" } - .bs-callout.privacy-policy-update-64341.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default{ role: 'alert', data: { feature_id: UserCalloutsHelper::PRIVACY_POLICY_UPDATE_64341, dismiss_endpoint: user_callouts_path, defer_links: "true" } } - %button.close.js-close{ type: "button" } - = sprite_icon("close", size: 16) - %p= _('Our Privacy Policy has changed, please visit %{privacy_policy_link} to review these changes.').html_safe % { privacy_policy_link: privacy_policy_link } |