diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-07-24 05:46:36 -0700 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-07-24 05:46:36 -0700 |
| commit | eca823c1c7cef45cc18c6ab36d2327650c85bfc3 (patch) | |
| tree | 50b6d6cce1d1da7f5a6e08b497b1b35718db30a9 /app/models/merge_request.rb | |
| parent | 024e0348904179a8dea81c01e27a5f014cf57499 (diff) | |
| parent | 8b7e404b5b6944e9c92cc270b2e5d0005781d49d (diff) | |
| download | gitlab-ce-eca823c1c7cef45cc18c6ab36d2327650c85bfc3.tar.gz | |
Merge branch 'master' into api
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d3e531f7818..2581f3be4c9 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -22,7 +22,6 @@ class MergeRequest < ActiveRecord::Base :should_remove_source_branch validates_presence_of :project_id - validates_presence_of :assignee_id validates_presence_of :author_id validates_presence_of :source_branch validates_presence_of :target_branch @@ -36,6 +35,7 @@ class MergeRequest < ActiveRecord::Base delegate :name, :email, :to => :assignee, + :allow_nil => true, :prefix => true validates :title, @@ -128,7 +128,7 @@ class MergeRequest < ActiveRecord::Base def unmerged_diffs commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)} - diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) + diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue [] end def last_commit |