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
1	1	v 2.7.0
2	2	- Issue Labels
	3	+ - Inline diff
	4	+ - Git HTTP
	5	+ - API
	6	+ - UI improved
3	7
4	8	v 2.6.0
5	9	- UI polished
...	...
...	...	@@ -317,6 +317,10 @@ table.no-borders {
317	317	&.closed {
318	318	background-color: #B94A48;
319	319	}
	320	+
	321	+ &.merged {
	322	+ background-color: #2A2;
	323	+ }
320	324	}
321	325
322	326	img.avatar {
...	...
...	...	@@ -128,7 +128,7 @@ class MergeRequest < ActiveRecord::Base
128	128
129	129	def unmerged_diffs
130	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	132	end
133	133
134	134	def last_commit
...	...
1	1	module Gitlab
2		- class Logger
	2	+ class Logger < ::Logger
3	3	def self.error(message)
4		- @@logger \|\|= ::Logger.new(File.join(Rails.root, "log/githost.log"))
5		- message = Time.now.to_s(:long) + " -> " + message
6		- @@logger.error(message)
	4	+ build.error(message)
	5	+ end
	6	+
	7	+ def self.info(message)
	8	+ build.info(message)
7	9	end
8	10
9	11	def self.read_latest
10	12	path = Rails.root.join("log/githost.log")
11	13	logs = File.read(path).split("\n")
12	14	end
	15	+
	16	+ def self.build
	17	+ new(File.join(Rails.root, "log/githost.log"))
	18	+ end
	19	+
	20	+ def format_message(severity, timestamp, progname, msg)
	21	+ "#{timestamp.to_s(:long)} -> #{severity} -> #{msg}\n"
	22	+ end
13	23	end
14	24	end
...	...