Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
daef0f75fb58
Commit
1a5e84fe
authored
May 08, 2017
by
James Lopez
Browse files
Merge branch 'fix/gl-project-id' into 'master'
Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
parents
6881600965de
478a47a3d193
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/models/commit_status.rb
View file @
daef0f75
...
...
@@ -142,12 +142,6 @@ def auto_canceled?
canceled?
&&
auto_canceled_by_id?
end
# Added in 9.0 to keep backward compatibility for projects exported in 8.17
# and prior.
def
gl_project_id
'dummy'
end
def
detailed_status
(
current_user
)
Gitlab
::
Ci
::
Status
::
Factory
.
new
(
self
,
current_user
)
...
...
lib/gitlab/import_export/import_export.yml
View file @
daef0f75
...
...
@@ -108,7 +108,6 @@ methods:
-
:type
statuses
:
-
:type
-
:gl_project_id
services
:
-
:type
merge_request_diff
:
...
...
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