added ebuilds for gitlabhq-7.9.3 and gitlab-shell-2.6.0

2015-04-09 11:55:32 +02:00 · 2015-04-09 11:55:32 +02:00 · a11192d241
commit a11192d241
parent a8079f2878
6 changed files with 593 additions and 0 deletions
--- a/www-apps/gitlabhq/files/gitlabhq-7.9.3-email-custom-reply_to.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-7.9.3-email-custom-reply_to.patch
@ -0,0 +1,39 @@
+diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
+index ee27879..90364a0 100644
+--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
+@@ -19,7 +19,7 @@ class Notify < ActionMailer::Base
+   default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
+ 
+   default from: Proc.new { default_sender_address.format }
+-  default reply_to: "noreply@#{Gitlab.config.gitlab.host}"
+  default reply_to: Gitlab.config.gitlab.email_reply_to
+ 
+   # Just send email with 2 seconds delay
+   def self.delay
+diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
+index a85db10..47605d2 100644
+--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
+@@ -45,6 +45,9 @@ production: &base
+     email_from: example@example.com
+     email_display_name: GitLab
+ 
+    # Email address used in the "Reply-To" field in mails send by GitLab (default: no-reply@<host>
+    email_reply_to: no-reply@example.com
+
+     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
+ 
+     # default_can_create_group: false  # default: true
+diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
+index 70af7a8..ee00e17 100644
+--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
+@@ -103,6 +103,7 @@ Settings.gitlab['protocol']   ||= Settings.gitlab.https ? "https" : "http"
+ Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].nil?
+ Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
+ Settings.gitlab['email_display_name'] ||= "GitLab"
+Settings.gitlab['email_reply_to'] ||= "no-reply@#{Settings.gitlab.host}"
+ Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
+ Settings.gitlab['user']       ||= 'git'
+ Settings.gitlab['user_home']  ||= begin
--- a/www-apps/gitlabhq/files/gitlabhq-7.9.3-fix-gemfile.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-7.9.3-fix-gemfile.patch
@ -0,0 +1,47 @@
+diff --git a/Gemfile b/Gemfile
+index f697f09..770b7b0 100644
+--- a/Gemfile
+++ b/Gemfile
+@@ -168,6 +168,10 @@ gem "underscore-rails", "~> 1.4.4"
+ # Sanitize user input
+ gem "sanitize", '~> 2.0'
+ 
+# The newer revision of charlock_holmes that is finally fixed to
+# be compatible with Gentoo
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
+
+ # Protect against bruteforcing
+ gem "rack-attack"
+ 
+diff --git a/Gemfile.lock b/Gemfile.lock
+index c38daf6..067fc86 100644
+--- a/Gemfile.lock
+++ b/Gemfile.lock
+@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/brianmario/charlock_holmes.git
+  revision: dde194609b3513b0d2369ce8f916ae52566154b4
+  ref: dde194609b3513b0d2369ce8f916ae52566154b4
+  specs:
+    charlock_holmes (0.6.9.4)
+
+ GEM
+   remote: https://rubygems.org/
+   specs:
+@@ -91,7 +98,6 @@ GEM
+       json (>= 1.7)
+     celluloid (0.16.0)
+       timers (~> 4.0.0)
+-    charlock_holmes (0.6.9.4)
+     cliver (0.3.2)
+     coderay (1.1.0)
+     coercible (1.0.0)
+@@ -672,7 +678,7 @@ DEPENDENCIES
+   cal-heatmap-rails (~> 0.0.1)
+   capybara (~> 2.2.1)
+   carrierwave
+-  charlock_holmes
+  charlock_holmes!
+   coffee-rails
+   colored
+   coveralls