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
5204911f
Commit
5204911f
authored
Sep 05, 2016
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't fail on an empty database
parent
e683eecd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
db/migrate/20160902122721_drop_gitorious_field_from_application_settings.rb
...2122721_drop_gitorious_field_from_application_settings.rb
+10
-5
db/schema.rb
db/schema.rb
+1
-1
No files found.
db/migrate/20160902122721_drop_gitorious_field_from_application_settings.rb
View file @
5204911f
...
@@ -7,11 +7,16 @@ class DropGitoriousFieldFromApplicationSettings < ActiveRecord::Migration
...
@@ -7,11 +7,16 @@ class DropGitoriousFieldFromApplicationSettings < ActiveRecord::Migration
def
up
def
up
require
'yaml'
require
'yaml'
yaml
=
if
Gitlab
::
Database
.
postgresql?
import_sources
=
connection
.
execute
(
'SELECT import_sources FROM application_settings;'
)
connection
.
execute
(
'SELECT import_sources FROM application_settings;'
).
values
[
0
][
0
]
else
yaml
=
if
Gitlab
::
Database
.
postgresql?
connection
.
execute
(
'SELECT import_sources FROM application_settings;'
).
first
[
0
]
import_sources
.
values
[
0
][
0
]
end
else
return
unless
import_sources
.
first
import_sources
.
first
[
0
]
end
yaml
=
YAML
.
safe_load
(
yaml
)
yaml
=
YAML
.
safe_load
(
yaml
)
yaml
.
delete
'gitorious'
yaml
.
delete
'gitorious'
...
...
db/schema.rb
View file @
5204911f
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended that you check this file into your version control system.
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2016090
2122721
)
do
ActiveRecord
::
Schema
.
define
(
version:
2016090
1141443
)
do
# These are extensions that must be enabled in order to support this database
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
enable_extension
"plpgsql"
...
...
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