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
98e9e33c
Commit
98e9e33c
authored
Jun 25, 2020
by
Sanad Liaquat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'qa-shl-consider-onboarding-on-login' into 'master'"
This reverts merge request !35217
parent
cabc2b8f
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2 additions
and
47 deletions
+2
-47
ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
...onboarding/onboarding_welcome/components/welcome_page.vue
+1
-1
qa/qa.rb
qa/qa.rb
+0
-1
qa/qa/ee.rb
qa/qa/ee.rb
+0
-1
qa/qa/ee/page/main/onboarding.rb
qa/qa/ee/page/main/onboarding.rb
+0
-27
qa/qa/page/main/login.rb
qa/qa/page/main/login.rb
+0
-4
qa/qa/page/main/onboarding.rb
qa/qa/page/main/onboarding.rb
+0
-12
qa/qa/page/main/terms.rb
qa/qa/page/main/terms.rb
+1
-1
No files found.
ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue
View file @
98e9e33c
...
@@ -129,7 +129,7 @@ export default {
...
@@ -129,7 +129,7 @@ export default {
{{
__
(
"
Ok let's go
"
)
}}
{{
__
(
"
Ok let's go
"
)
}}
</gl-link>
</gl-link>
<p
class=
"small mt-8"
>
<p
class=
"small mt-8"
>
<gl-link
class=
"qa-skip-tour-btn"
data-qa-selector=
"skip_for_now_link"
@
click=
"skipTour"
>
<gl-link
class=
"qa-skip-tour-btn"
@
click=
"skipTour"
>
{{
skipText
}}
{{
skipText
}}
</gl-link>
</gl-link>
</p>
</p>
...
...
qa/qa.rb
View file @
98e9e33c
...
@@ -183,7 +183,6 @@ module QA
...
@@ -183,7 +183,6 @@ module QA
autoload
:OAuth
,
'qa/page/main/oauth'
autoload
:OAuth
,
'qa/page/main/oauth'
autoload
:SignUp
,
'qa/page/main/sign_up'
autoload
:SignUp
,
'qa/page/main/sign_up'
autoload
:Terms
,
'qa/page/main/terms'
autoload
:Terms
,
'qa/page/main/terms'
autoload
:Onboarding
,
'qa/page/main/onboarding'
end
end
module
Settings
module
Settings
...
...
qa/qa/ee.rb
View file @
98e9e33c
...
@@ -49,7 +49,6 @@ module QA
...
@@ -49,7 +49,6 @@ module QA
module
Main
module
Main
autoload
:Banner
,
'qa/ee/page/main/banner'
autoload
:Banner
,
'qa/ee/page/main/banner'
autoload
:Onboarding
,
'qa/ee/page/main/onboarding'
end
end
module
Admin
module
Admin
...
...
qa/qa/ee/page/main/onboarding.rb
deleted
100644 → 0
View file @
cabc2b8f
# frozen_string_literal: true
module
QA
module
EE
module
Page
module
Main
module
Onboarding
extend
QA
::
Page
::
PageConcern
def
self
.
prepended
(
base
)
super
base
.
class_eval
do
view
'ee/app/assets/javascripts/onboarding/onboarding_welcome/components/welcome_page.vue'
do
element
:skip_for_now_link
,
required:
true
end
end
end
def
skip_for_now
click_element
:skip_for_now_link
,
::
QA
::
Page
::
Main
::
Menu
end
end
end
end
end
end
qa/qa/page/main/login.rb
View file @
98e9e33c
...
@@ -165,10 +165,6 @@ module QA
...
@@ -165,10 +165,6 @@ module QA
terms
.
accept_terms
if
terms
.
visible?
terms
.
accept_terms
if
terms
.
visible?
end
end
QA
::
Page
::
Main
::
Onboarding
.
perform
do
|
onboarding
|
onboarding
.
skip_for_now
if
onboarding
.
respond_to?
(
:skip_for_now
)
&&
onboarding
.
visible?
end
Page
::
Main
::
Menu
.
validate_elements_present!
unless
skip_page_validation
Page
::
Main
::
Menu
.
validate_elements_present!
unless
skip_page_validation
end
end
...
...
qa/qa/page/main/onboarding.rb
deleted
100644 → 0
View file @
cabc2b8f
# frozen_string_literal: true
module
QA
module
Page
module
Main
class
Onboarding
<
Page
::
Base
end
end
end
end
QA
::
Page
::
Main
::
Onboarding
.
prepend_if_ee
(
'QA::EE::Page::Main::Onboarding'
)
qa/qa/page/main/terms.rb
View file @
98e9e33c
...
@@ -15,7 +15,7 @@ module QA
...
@@ -15,7 +15,7 @@ module QA
end
end
def
accept_terms
def
accept_terms
click_element
:accept_terms_button
click_element
:accept_terms_button
,
Page
::
Main
::
Menu
end
end
end
end
end
end
...
...
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