Permalink
Browse files

CHANGELOG updated. Fixed MR bug. Logger improved

  • Loading branch information...
1 parent 494cd02 commit 88033500232f12234a9546aa9b89111bcdbfecef @randx randx committed Jul 17, 2012
Showing with 23 additions and 5 deletions.
  1. +4 −0 CHANGELOG
  2. +4 −0 app/assets/stylesheets/gitlab_bootstrap.scss
  3. +1 −1 app/models/merge_request.rb
  4. +14 −4 lib/gitlab/logger.rb
View
4 CHANGELOG
@@ -1,5 +1,9 @@
v 2.7.0
- Issue Labels
+ - Inline diff
+ - Git HTTP
+ - API
+ - UI improved
v 2.6.0
- UI polished
View
4 app/assets/stylesheets/gitlab_bootstrap.scss
@@ -317,6 +317,10 @@ table.no-borders {
&.closed {
background-color: #B94A48;
}
+
+ &.merged {
+ background-color: #2A2;
+ }
}
img.avatar {
View
2 app/models/merge_request.rb
@@ -128,7 +128,7 @@ def valid_diffs?
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
View
18 lib/gitlab/logger.rb
@@ -1,14 +1,24 @@
module Gitlab
- class Logger
+ class Logger < ::Logger
def self.error(message)
- @@logger ||= ::Logger.new(File.join(Rails.root, "log/githost.log"))
- message = Time.now.to_s(:long) + " -> " + message
- @@logger.error(message)
+ build.error(message)
+ end
+
+ def self.info(message)
+ build.info(message)
end
def self.read_latest
path = Rails.root.join("log/githost.log")
logs = File.read(path).split("\n")
end
+
+ def self.build
+ new(File.join(Rails.root, "log/githost.log"))
+ end
+
+ def format_message(severity, timestamp, progname, msg)
+ "#{timestamp.to_s(:long)} -> #{severity} -> #{msg}\n"
+ end
end
end

0 comments on commit 8803350

Please sign in to comment.