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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
8c1b41f1
Commit
8c1b41f1
authored
Feb 14, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move migration to post_migrate; fix shortcuts_spec
parent
2fc55914
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
db/post_migrate/20170213172852_remove_theme_id_from_users.rb
db/post_migrate/20170213172852_remove_theme_id_from_users.rb
+1
-1
spec/features/dashboard/shortcuts_spec.rb
spec/features/dashboard/shortcuts_spec.rb
+2
-1
No files found.
db/migrate/20170213172852_remove_theme_id_from_users.rb
→
db/
post_
migrate/20170213172852_remove_theme_id_from_users.rb
View file @
8c1b41f1
...
@@ -5,7 +5,7 @@ class RemoveThemeIdFromUsers < ActiveRecord::Migration
...
@@ -5,7 +5,7 @@ class RemoveThemeIdFromUsers < ActiveRecord::Migration
include
Gitlab
::
Database
::
MigrationHelpers
include
Gitlab
::
Database
::
MigrationHelpers
# Set this constant to true if this migration requires downtime.
# Set this constant to true if this migration requires downtime.
DOWNTIME
=
tru
e
DOWNTIME
=
fals
e
# When a migration requires downtime you **must** uncomment the following
# When a migration requires downtime you **must** uncomment the following
# constant and define a short and easy to understand explanation as to why the
# constant and define a short and easy to understand explanation as to why the
...
...
spec/features/dashboard/shortcuts_spec.rb
View file @
8c1b41f1
...
@@ -24,6 +24,7 @@ feature 'Dashboard shortcuts', feature: true, js: true do
...
@@ -24,6 +24,7 @@ feature 'Dashboard shortcuts', feature: true, js: true do
end
end
def
ensure_active_main_tab
(
content
)
def
ensure_active_main_tab
(
content
)
expect
(
find
(
'.nav-sidebar li.active'
)).
to
have_content
(
content
)
find
(
'.global-dropdown-toggle'
).
trigger
(
'click'
)
expect
(
find
(
'.global-dropdown-menu li.active'
)).
to
have_content
(
content
)
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