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
Boxiang Sun
gitlab-ce
Commits
bddef293
Commit
bddef293
authored
Jan 18, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure that doesn't have pending migrations when running the specs
parent
1d5f96cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
lib/gitlab/current_settings.rb
lib/gitlab/current_settings.rb
+0
-1
No files found.
.gitlab-ci.yml
View file @
bddef293
...
...
@@ -8,7 +8,7 @@ before_script:
-
touch log/application.log
-
touch log/test.log
-
bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
-
bundle exec rake db:reset db:create RAILS_ENV=test
-
RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate
spec:feature:
script
:
...
...
@@ -118,7 +118,7 @@ flay:
-
mysql
bundler:audit:
script
:
script
:
-
"
bundle
exec
bundle-audit
update"
-
"
bundle
exec
bundle-audit
check"
tags
:
...
...
lib/gitlab/current_settings.rb
View file @
bddef293
...
...
@@ -39,7 +39,6 @@ module Gitlab
end
use_db
&&
ActiveRecord
::
Base
.
connection
.
active?
&&
!
ActiveRecord
::
Migrator
.
needs_migration?
&&
ActiveRecord
::
Base
.
connection
.
table_exists?
(
'application_settings'
)
rescue
ActiveRecord
::
NoDatabaseError
...
...
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