Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
629b57b6
Commit
629b57b6
authored
Dec 16, 2021
by
Peter Hegman
Committed by
Illya Klymov
Dec 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove `terms_of_service_vue` feature flag
parent
bfafb1c8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
31 deletions
+2
-31
app/views/users/terms/index.html.haml
app/views/users/terms/index.html.haml
+1
-22
config/feature_flags/development/terms_of_service_vue.yml
config/feature_flags/development/terms_of_service_vue.yml
+0
-8
qa/qa/page/main/terms.rb
qa/qa/page/main/terms.rb
+1
-1
No files found.
app/views/users/terms/index.html.haml
View file @
629b57b6
-
redirect_params
=
{
redirect:
@redirect
}
if
@redirect
-
accept_term_link
=
accept_term_path
(
@term
,
redirect_params
)
-
content_for
:page_specific_javascripts
do
=
render
"layouts/google_tag_manager_head"
=
render
"layouts/one_trust"
=
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
)
}
}
-
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'
)
#js-terms-of-service
{
data:
{
terms_data:
terms_data
(
@term
,
@redirect
)
}
}
config/feature_flags/development/terms_of_service_vue.yml
deleted
100644 → 0
View file @
bfafb1c8
---
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
qa/qa/page/main/terms.rb
View file @
629b57b6
...
...
@@ -8,7 +8,7 @@ module QA
element
:user_avatar
,
required:
true
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
:accept_terms_button
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment