diff options
author | skv <skv-headless@yandex.ru> | 2013-12-14 17:43:48 +0400 |
---|---|---|
committer | skv <skv-headless@yandex.ru> | 2013-12-15 00:05:10 +0400 |
commit | d89527839ea0dd1734dacb71c3ed2a97f1ff74d7 (patch) | |
tree | 3fe4c3f961cefb0c06e956bb7906bbc943c90703 /app/models/project.rb | |
parent | ee53b73986ba4c9dd2f0c726a44718acb8febaf8 (diff) | |
download | gitlab-ce-d89527839ea0dd1734dacb71c3ed2a97f1ff74d7.tar.gz |
fix most of warnings
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 39f0d71b337..506f34ca6b6 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -322,14 +322,14 @@ class Project < ActiveRecord::Base c_ids = self.repository.commits_between(oldrev, newrev).map(&:id) # Update code for merge requests into project between project branches - mrs = self.merge_requests.opened.by_branch(branch_name).all + mrs = self.merge_requests.opened.by_branch(branch_name).to_a # Update code for merge requests between project and project fork - mrs += self.fork_merge_requests.opened.by_branch(branch_name).all + mrs += self.fork_merge_requests.opened.by_branch(branch_name).to_a mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked } # Close merge requests - mrs = self.merge_requests.opened.where(target_branch: branch_name).all + mrs = self.merge_requests.opened.where(target_branch: branch_name).to_a mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) } mrs.each { |merge_request| merge_request.merge!(user.id) } |