diff options
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 6b8e54d5b22..b5dc2490359 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -317,7 +317,7 @@ class Project < ActiveRecord::Base mrs = self.merge_requests.opened.by_branch(branch_name).all # Update code for merge requests between project and project fork mrs += self.fork_merge_requests.opened.by_branch(branch_name).all - + mrs.each { |merge_request| merge_request.reload_code; merge_request.mark_as_unchecked } # Close merge requests @@ -447,4 +447,8 @@ class Project < ActiveRecord::Base order('id DESC').limit(100). update_all(updated_at: Time.now) end + + def project_member(user) + users_projects.where(user_id: user).first + end end |