summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2017-05-08 06:52:01 +0000
committerJames Lopez <james@gitlab.com>2017-05-08 06:52:01 +0000
commit1a5e84febeb3f2d63c019981e80c777195c37dd2 (patch)
tree31cf4853d06cda899dc2142123ff622cbf6bb28f
parent8b9cd3c072768ca810d2b33009e35d93a05e417f (diff)
parent702b291f81b576c08f8e194d87fb779b4ce0fd6c (diff)
downloadgitlab-ce-1a5e84febeb3f2d63c019981e80c777195c37dd2.tar.gz
Merge branch 'fix/gl-project-id' into 'master'
Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
-rw-r--r--app/models/commit_status.rb6
-rw-r--r--lib/gitlab/import_export/import_export.yml1
2 files changed, 0 insertions, 7 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 2c4033146bf..75d04fd2b08 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -142,12 +142,6 @@ class CommitStatus < ActiveRecord::Base
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)
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 89088ee8762..d0f3cf2b514 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -108,7 +108,6 @@ methods:
- :type
statuses:
- :type
- - :gl_project_id
services:
- :type
merge_request_diff: