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
bf02cc68
Commit
bf02cc68
authored
Aug 16, 2019
by
Alex Buijs
Committed by
Filipa Lacerda
Aug 16, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not show the onboarding welcome page on mobile devices
parent
a44e3004
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
1 deletion
+42
-1
ee/app/assets/javascripts/onboarding/onboarding_welcome/index.js
...assets/javascripts/onboarding/onboarding_welcome/index.js
+8
-0
ee/changelogs/unreleased/11968-make-sure-not-to-redirect-to-the-onboarding-welcome-page-on-mobile-devices.yml
...rect-to-the-onboarding-welcome-page-on-mobile-devices.yml
+6
-0
ee/spec/features/onboarding/user_onboarding_spec.rb
ee/spec/features/onboarding/user_onboarding_spec.rb
+28
-1
No files found.
ee/app/assets/javascripts/onboarding/onboarding_welcome/index.js
View file @
bf02cc68
import
Vue
from
'
vue
'
;
import
WelcomePage
from
'
./components/welcome_page.vue
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
redirectTo
}
from
'
~/lib/utils/url_utility
'
;
import
onboardingUtils
from
'
./../utils
'
;
import
breakpointInstance
from
'
~/breakpoints
'
;
export
default
function
()
{
const
el
=
document
.
getElementById
(
'
js-onboarding-welcome
'
);
...
...
@@ -11,6 +14,11 @@ export default function() {
const
{
userAvatarUrl
,
projectFullPath
,
skipUrl
,
fromHelpMenu
}
=
el
.
dataset
;
if
(
!
breakpointInstance
.
isDesktop
())
{
onboardingUtils
.
updateOnboardingDismissed
(
true
);
return
redirectTo
(
skipUrl
);
}
return
new
Vue
({
el
,
render
(
h
)
{
...
...
ee/changelogs/unreleased/11968-make-sure-not-to-redirect-to-the-onboarding-welcome-page-on-mobile-devices.yml
0 → 100644
View file @
bf02cc68
---
title
:
Resolve Make sure not to redirect to the onboarding welcome page on mobile
devices
merge_request
:
14842
author
:
type
:
fixed
ee/spec/features/onboarding/user_onboarding_spec.rb
View file @
bf02cc68
...
...
@@ -3,6 +3,8 @@
require
'spec_helper'
describe
'User Onboarding'
do
include
MobileHelpers
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
...
...
@@ -18,15 +20,29 @@ describe 'User Onboarding' do
end
describe
'help menu'
do
it
'shows the "Learn GitLab" item in the help menu'
do
before
do
visit
root_dashboard_path
find
(
'.header-help-dropdown-toggle'
).
click
end
it
'shows the "Learn GitLab" item in the help menu'
do
page
.
within
(
'.header-help'
)
do
expect
(
page
).
to
have_link
(
'Learn GitLab'
,
href:
explore_onboarding_index_path
(
from_help_menu:
true
))
end
end
context
'when on a mobile device'
do
before
do
resize_screen_sm
end
it
'does not show the "Learn GitLab" item in the help menu'
do
page
.
within
(
'.header-help'
)
do
expect
(
page
).
not_to
have_link
(
'Learn GitLab'
)
end
end
end
end
describe
'welcome page'
do
...
...
@@ -40,6 +56,17 @@ describe 'User Onboarding' do
expect
(
page
).
to
have_content
(
'Welcome to the Guided GitLab Tour'
)
end
context
'when on a mobile device'
do
before
do
resize_screen_sm
end
it
'does not show the "Learn GitLab" welcome page'
do
visit
explore_onboarding_index_path
expect
(
page
).
not_to
have_content
(
'Welcome to the Guided GitLab Tour'
)
end
end
end
describe
'onboarding helper'
do
...
...
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