summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b3af3ff7c17..0ac291ce1a0 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -13,7 +13,6 @@ 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
has_many :events, as: :target, dependent: :destroy
@@ -35,8 +34,6 @@ class MergeRequest < ActiveRecord::Base
# when creating new merge request
attr_accessor :can_be_created, :compare_commits, :compare
- after_save :record_metrics
-
state_machine :state, initial: :opened do
event :close do
transition [:reopened, :opened] => :closed
@@ -515,7 +512,7 @@ class MergeRequest < ActiveRecord::Base
transaction do
self.merge_requests_closing_issues.delete_all
closes_issues(current_user).each do |issue|
- MergeRequestsClosingIssues.create!(merge_request: self, issue: issue)
+ self.merge_requests_closing_issues.create!(issue: issue)
end
end
end
@@ -845,9 +842,4 @@ class MergeRequest < ActiveRecord::Base
@conflicts_can_be_resolved_in_ui = false
end
end
-
- def record_metrics
- metrics = Metrics.find_or_create_by(merge_request_id: self.id)
- metrics.record!
- end
end