deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

CHANGELOG updated. Fixed MR bug. Logger improved

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-07-17 08:23:16 +03:00
parent 494cd02b38
commit 8803350023
4 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/gitlab_bootstrap.scss
View file

@ -317,6 +317,10 @@ table.no-borders {
&.closed {
background-color: #B94A48;
}
&.merged {
background-color: #2A2;
}
}
img.avatar {

2
app/models/merge_request.rb
View file

@ -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