git-commit-notifier 0.12.2 → 0.12.3

data/CHANGES.md

@@ -2,6 +2,10 @@
 
 ## Not yet released
 
+## Version 0.12.3
+
+* Links updated for Gitlab 5.x
+
 ## Version 0.12.2
 
 * Restrict `nokogiri` gem version to be lower than 1.6.0 to allow Ruby 1.8.7 installations.

data/Gemfile

@@ -4,6 +4,10 @@ gemspec
 
 gem "rcov", :group => :test, :platforms => :mri_18
 gem "erubis", "~> 2.7"
+
 gem "ripper", :group => :development, :platforms => :mri_18
+gem "redcarpet", "~> 3.0", :group => :development, :platforms => :mri
+gem "yard-redcarpet-ext", "~> 0.0.3", :group => :development, :platforms => :mri
+gem "maruku", :group => :development, :platforms => :jruby
 
 gem "coveralls", :require => false, :platforms => [:mri_19, :mri_20], :group => :development

data/VERSION

@@ -1 +1 @@
-0.12.2
+0.12.3

data/git-commit-notifier.gemspec

@@ -39,6 +39,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rr>, ["~> 1.0"])
   s.add_development_dependency(%q<faker>, ["~> 1.1.2"])
   s.add_development_dependency(%q<yard>, ["~> 0.8.1"])
-  s.add_development_dependency(%q<redcarpet>, ["~> 3.0"])
-  s.add_development_dependency(%q<yard-redcarpet-ext>, ["~> 0.0.3"])
 end

data/lib/git_commit_notifier/diff_to_html.rb

@@ -215,6 +215,8 @@ module GitCommitNotifier
         elsif config["link_files"] == "gitlabhq" && config["gitlabhq"]
           if config["gitlabhq"]["version"] && config["gitlabhq"]["version"] < 1.2
             "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/tree/#{@current_commit}/#{file_name}'>#{file_name}</a>"
+          elsif config["gitlabhq"]["version"] && config["gitlabhq"]["version"] >= 5.0
+            "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name_with_parent.gsub(".", "_")}/blob/#{@current_commit}/#{file_name}'>#{file_name}</a>"
           elsif config["gitlabhq"]["version"] && config["gitlabhq"]["version"] >= 4.0
             "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name_with_parent.gsub(".", "_")}/commit/#{@current_commit}'>#{file_name}</a>"
           else
@@ -536,7 +538,9 @@ module GitCommitNotifier
       :trac      => lambda { |config, commit| "<a href='#{config['trac']['path']}/#{commit}'>#{commit}</a>" },
       :cgit      => lambda { |config, commit| "<a href='#{config['cgit']['path']}/#{config['cgit']['project'] || "#{Git.repo_name_real}"}/commit/?id=#{commit}'>#{commit}</a>" },
       :gitlabhq  => lambda { |config, commit|
-        if config['gitlabhq']['version'] >= 4.0
+        if config['gitlabhq']['version'] >= 5.0
+          "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name_with_parent.gsub(".", "_")}/commit/#{commit}'>#{commit}</a>"
+        elsif config['gitlabhq']['version'] >= 4.0
           "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name_with_parent.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>"
         else
           "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -244,38 +244,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: yard-redcarpet-ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
 description: This git commit notifier sends html mails with nice diffs for every changed
   file.
 email: bodo@bitboxer.de
@@ -356,7 +324,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -144969551668064151
+      hash: 1331678205794572639
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: