Skip to content

G
gitlab-ce
Commit 9ef6b3b0 authored by Nick Thomas's avatar Nick Thomas
Browse files
Options

CE->EE: Fix conflicts in app/models/project_import_data.rb

parent bc99951e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/project_import_data.rb
View file @ 9ef6b3b0
require 'carrierwave/orm/activerecord' require 'carrierwave/orm/activerecord'
class ProjectImportData < ActiveRecord::Base class ProjectImportData < ActiveRecord::Base
<<<<<<< HEAD
prepend ::EE::ProjectImportData prepend ::EE::ProjectImportData
=======
>>>>>>> upstream/master
belongs_to :project, inverse_of: :import_data belongs_to :project, inverse_of: :import_data
attr_encrypted :credentials, attr_encrypted :credentials,
key: Gitlab::Application.secrets.db_key_base, key: Gitlab::Application.secrets.db_key_base,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7