diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-15 10:56:42 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-15 10:56:42 +0000 |
| commit | e3c46a008b56fe4f6949c9f75ce6269329d2b3bf (patch) | |
| tree | e9be334b3f1d676e50361649af7d5aad0eec4c8a | |
| parent | ee39cbfc0e1bf75cd014cbff9420f081355dc3f8 (diff) | |
| parent | de460f7e4d06bec7bd6138c2b4edc956e9df4471 (diff) | |
| download | gitlab-ce-e3c46a008b56fe4f6949c9f75ce6269329d2b3bf.tar.gz | |
Merge branch 'class-name-to-string' into 'master'
Use string for class_name option for lazy autoload class
See merge request !8580
| -rw-r--r-- | app/models/forked_project_link.rb | 4 | ||||
| -rw-r--r-- | app/models/project.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/forked_project_link.rb b/app/models/forked_project_link.rb index 9803bae0bee..36cf7ad6a28 100644 --- a/app/models/forked_project_link.rb +++ b/app/models/forked_project_link.rb @@ -1,4 +1,4 @@ class ForkedProjectLink < ActiveRecord::Base - belongs_to :forked_to_project, class_name: Project - belongs_to :forked_from_project, class_name: Project + belongs_to :forked_to_project, class_name: 'Project' + belongs_to :forked_from_project, class_name: 'Project' end diff --git a/app/models/project.rb b/app/models/project.rb index c22386c84e9..e85d3d3bc6c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -122,7 +122,7 @@ class Project < ActiveRecord::Base # Merge Requests for target project should be removed with it has_many :merge_requests, dependent: :destroy, foreign_key: 'target_project_id' # Merge requests from source project should be kept when source project was removed - has_many :fork_merge_requests, foreign_key: 'source_project_id', class_name: MergeRequest + has_many :fork_merge_requests, foreign_key: 'source_project_id', class_name: 'MergeRequest' has_many :issues, dependent: :destroy has_many :labels, dependent: :destroy, class_name: 'ProjectLabel' has_many :services, dependent: :destroy |