diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-05-23 23:31:06 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-05-23 23:31:06 +0000 |
| commit | 16ca3ee636a50c81674309bb95e067d3faf56bb6 (patch) | |
| tree | 8ecc4a559b4ee2ba96c3015ec2ea7fefa9a3578e /features/steps/dashboard | |
| parent | 438b186a99d528992cb191bdfc1f509de51f942f (diff) | |
| parent | 510b5c5f396711b0bb45bad0a25da3a891583ebc (diff) | |
| download | gitlab-ce-16ca3ee636a50c81674309bb95e067d3faf56bb6.tar.gz | |
Merge branch 'project-navigation-redesign' into 'master'
Project navigation redesign
Based on !3980. Part of #14838. This MR targets on desktop version. Mobile version improvements will be in separate merge request.
Part of #17522
cc @jschatz1
See merge request !4053
Diffstat (limited to 'features/steps/dashboard')
| -rw-r--r-- | features/steps/dashboard/active_tab.rb | 6 | ||||
| -rw-r--r-- | features/steps/dashboard/shortcuts.rb | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/features/steps/dashboard/active_tab.rb b/features/steps/dashboard/active_tab.rb index 0e2c04fb299..04fe96cef22 100644 --- a/features/steps/dashboard/active_tab.rb +++ b/features/steps/dashboard/active_tab.rb @@ -1,9 +1,5 @@ class Spinach::Features::DashboardActiveTab < Spinach::FeatureSteps include SharedAuthentication include SharedPaths - include SharedActiveTab - - step 'the active main tab should be Help' do - ensure_active_main_tab('Help') - end + include SharedSidebarActiveTab end diff --git a/features/steps/dashboard/shortcuts.rb b/features/steps/dashboard/shortcuts.rb index a9083850b52..118d27888df 100644 --- a/features/steps/dashboard/shortcuts.rb +++ b/features/steps/dashboard/shortcuts.rb @@ -2,5 +2,6 @@ class Spinach::Features::DashboardShortcuts < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject - include SharedActiveTab + include SharedSidebarActiveTab + include SharedShortcuts end |