diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-09-20 15:06:54 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-09-20 16:05:25 +0530 |
| commit | 8957293d9bd0d711db3af26182205c2fe4125194 (patch) | |
| tree | dcdd25393e2d6248971fddbd6c9eac30fe27ff6e /app/models/merge_request.rb | |
| parent | fa890604aaf15b9e4f0199e6a4cff24c29955a37 (diff) | |
| download | gitlab-ce-8957293d9bd0d711db3af26182205c2fe4125194.tar.gz | |
Implement review comments from @yorickpeterse
1. Change multiple updates to a single `update_all`
2. Use cascading deletes
3. Extract an average function for the database median.
4. Move database median to `lib/gitlab/database`
5. Use `delete_all` instead of `destroy_all`
6. Minor refactoring
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index e7af37a6c0a..2daaaf42da6 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -13,11 +13,11 @@ class MergeRequest < ActiveRecord::Base has_many :merge_request_diffs, dependent: :destroy has_one :merge_request_diff, -> { order('merge_request_diffs.id DESC') } - has_one :metrics, dependent: :destroy + has_one :metrics has_many :events, as: :target, dependent: :destroy - has_many :merge_requests_closing_issues, class_name: MergeRequestsClosingIssues + has_many :merge_requests_closing_issues, class_name: 'MergeRequestsClosingIssues' has_many :issues_closed, through: :merge_requests_closing_issues, source: :issue serialize :merge_params, Hash @@ -513,7 +513,7 @@ class MergeRequest < ActiveRecord::Base # running `ReferenceExtractor` on each of them separately. def cache_merge_request_closes_issues!(current_user = self.author) transaction do - self.merge_requests_closing_issues.destroy_all + self.merge_requests_closing_issues.delete_all closes_issues(current_user).each do |issue| MergeRequestsClosingIssues.create!(merge_request: self, issue: issue) end |