Commit b4bdf3a8 authored by Illya Klymov's avatar Illya Klymov

Merge branch '343046-feature-flag-rollout-of-terms_of_service_vue' into 'master'

Remove `terms_of_service_vue` feature flag

See merge request gitlab-org/gitlab!76809
parents 9232778f 629b57b6
- redirect_params = { redirect: @redirect } if @redirect
- accept_term_link = accept_term_path(@term, redirect_params)
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= render "layouts/google_tag_manager_head" = render "layouts/google_tag_manager_head"
= render "layouts/one_trust" = render "layouts/one_trust"
= render "layouts/google_tag_manager_body" = render "layouts/google_tag_manager_body"
- if Feature.enabled?(:terms_of_service_vue, current_user, default_enabled: :yaml) #js-terms-of-service{ data: { terms_data: terms_data(@term, @redirect) } }
#js-terms-of-service{ data: { terms_data: terms_data(@term, @redirect) } }
- else
.card-body.rendered-terms{ data: { qa_selector: 'terms_content' } }
= markdown_field(@term, :terms)
- if current_user
= render_if_exists 'devise/shared/form_phone_verification', accept_term_link: accept_term_link, inline: true
.card-footer.footer-block.clearfix
- if can?(current_user, :accept_terms, @term)
.float-right
= button_to accept_term_link, class: 'gl-button btn btn-confirm gl-ml-3', data: { qa_selector: 'accept_terms_button' } do
= _('Accept terms')
- else
.float-right
= link_to root_path, class: 'gl-button btn btn-confirm gl-ml-3' do
= _('Continue')
- if can?(current_user, :decline_terms, @term)
.float-right
= button_to decline_term_path(@term, redirect_params), class: 'gl-button btn btn-default gl-ml-3' do
= _('Decline and sign out')
---
name: terms_of_service_vue
introduced_by_url:
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343046
milestone: '14.5'
type: development
group: group::access
default_enabled: true
...@@ -8,7 +8,7 @@ module QA ...@@ -8,7 +8,7 @@ module QA
element :user_avatar, required: true element :user_avatar, required: true
end end
view 'app/views/users/terms/index.html.haml' do view 'app/assets/javascripts/terms/components/app.vue' do
element :terms_content, required: true element :terms_content, required: true
element :accept_terms_button element :accept_terms_button
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment