CHANGELOG updated. Fixed MR bug. Logger improved

Dmitriy Zaporozhets
1 parent 494cd02b
Showing 4 changed files with 23 additions and 5 deletions Show diff stats
CHANGELOG
app/assets/stylesheets/gitlab_bootstrap.scss
app/models/merge_request.rb
lib/gitlab/logger.rb
 v 2.7.0
   - Issue Labels
+  - Inline diff
+  - Git HTTP
+  - API
+  - UI improved
 v 2.6.0
   - UI polished
@@ -317,6 +317,10 @@ table.no-borders {
   &.closed { 
     background-color: #B94A48;
   }
+
+  &.merged { 
+    background-color: #2A2;
+  }
 }
 img.avatar { 
@@ -128,7 +128,7 @@ class MergeRequest &lt; 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
 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
	@@ -128,7 +128,7 @@ class MergeRequest < ActiveRecord::Base		@@ -128,7 +128,7 @@ class MergeRequest < ActiveRecord::Base
128		128
129	def unmerged_diffs	129	def unmerged_diffs
130	commits = project.repo.commits_between(target_branch, source_branch).map {\|c\| Commit.new(c)}	130	commits = project.repo.commits_between(target_branch, source_branch).map {\|c\| Commit.new(c)}
131	- diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id)	131	+ diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
132	end	132	end
133		133
134	def last_commit	134	def last_commit