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
Léo-Paul Géneau
gitlab-ce
Commits
8604dbe9
Commit
8604dbe9
authored
Apr 30, 2018
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix up db/schema.rb changes leftover and comments out of date
parent
87740df2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
db/schema.rb
db/schema.rb
+0
-2
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+0
-1
spec/factories/projects.rb
spec/factories/projects.rb
+3
-3
No files found.
db/schema.rb
View file @
8604dbe9
...
@@ -450,7 +450,6 @@ ActiveRecord::Schema.define(version: 20180425131009) do
...
@@ -450,7 +450,6 @@ ActiveRecord::Schema.define(version: 20180425131009) do
add_index
"ci_runner_groups"
,
[
"group_id"
],
name:
"index_ci_runner_groups_on_group_id"
,
using: :btree
add_index
"ci_runner_groups"
,
[
"group_id"
],
name:
"index_ci_runner_groups_on_group_id"
,
using: :btree
add_index
"ci_runner_groups"
,
[
"runner_id"
,
"group_id"
],
name:
"index_ci_runner_groups_on_runner_id_and_group_id"
,
unique:
true
,
using: :btree
add_index
"ci_runner_groups"
,
[
"runner_id"
,
"group_id"
],
name:
"index_ci_runner_groups_on_runner_id_and_group_id"
,
unique:
true
,
using: :btree
add_index
"ci_runner_groups"
,
[
"runner_id"
],
name:
"index_ci_runner_groups_on_runner_id"
,
using: :btree
create_table
"ci_runner_projects"
,
force: :cascade
do
|
t
|
create_table
"ci_runner_projects"
,
force: :cascade
do
|
t
|
t
.
integer
"runner_id"
,
null:
false
t
.
integer
"runner_id"
,
null:
false
...
@@ -1573,7 +1572,6 @@ ActiveRecord::Schema.define(version: 20180425131009) do
...
@@ -1573,7 +1572,6 @@ ActiveRecord::Schema.define(version: 20180425131009) do
t
.
boolean
"merge_requests_rebase_enabled"
,
default:
false
,
null:
false
t
.
boolean
"merge_requests_rebase_enabled"
,
default:
false
,
null:
false
t
.
integer
"jobs_cache_index"
t
.
integer
"jobs_cache_index"
t
.
boolean
"pages_https_only"
,
default:
true
t
.
boolean
"pages_https_only"
,
default:
true
t
.
boolean
"group_runners_enabled"
,
default:
true
,
null:
false
end
end
add_index
"projects"
,
[
"ci_id"
],
name:
"index_projects_on_ci_id"
,
using: :btree
add_index
"projects"
,
[
"ci_id"
],
name:
"index_projects_on_ci_id"
,
using: :btree
...
...
lib/gitlab/import_export/import_export.yml
View file @
8604dbe9
...
@@ -107,7 +107,6 @@ excluded_attributes:
...
@@ -107,7 +107,6 @@ excluded_attributes:
-
:last_repository_check_at
-
:last_repository_check_at
-
:storage_version
-
:storage_version
-
:description_html
-
:description_html
-
:group_runners_enabled
snippets
:
snippets
:
-
:expired_at
-
:expired_at
merge_request_diff
:
merge_request_diff
:
...
...
spec/factories/projects.rb
View file @
8604dbe9
...
@@ -24,8 +24,8 @@ FactoryBot.define do
...
@@ -24,8 +24,8 @@ FactoryBot.define do
merge_requests_access_level
ProjectFeature
::
ENABLED
merge_requests_access_level
ProjectFeature
::
ENABLED
repository_access_level
ProjectFeature
::
ENABLED
repository_access_level
ProjectFeature
::
ENABLED
# we can't assign the delegated `#settings` attributes directly, as the
# we can't assign the delegated `#
ci_cd_
settings` attributes directly, as the
# `#settings` relation needs to be created first
# `#
ci_cd_
settings` relation needs to be created first
group_runners_enabled
nil
group_runners_enabled
nil
end
end
...
@@ -52,7 +52,7 @@ FactoryBot.define do
...
@@ -52,7 +52,7 @@ FactoryBot.define do
project
.
group
&
.
refresh_members_authorized_projects
project
.
group
&
.
refresh_members_authorized_projects
# assign the delegated `#settings` attributes after create
# assign the delegated `#
ci_cd_
settings` attributes after create
project
.
reload
.
group_runners_enabled
=
evaluator
.
group_runners_enabled
unless
evaluator
.
group_runners_enabled
.
nil?
project
.
reload
.
group_runners_enabled
=
evaluator
.
group_runners_enabled
unless
evaluator
.
group_runners_enabled
.
nil?
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