updated patch for gitlab-8.7

This commit is contained in:
Manuel Friedli 2016-04-22 13:08:36 +02:00
parent 74a3101ab4
commit e0703690b4
3 changed files with 29 additions and 2 deletions

View File

@ -1,3 +1,4 @@
AUX gitlab-ce-8.7.0-fix-redis-config-path.patch 781 SHA256 61210486d4d73f442b9fe3e38367ce278a2a476ffe78b39813436dc03ac346ae SHA512 d027e1cb081226488c899046eaa283dd03de802a39780ce99a69a6620ed79e4b8f85b40b496f925f89b5406c54be294f0fded8c4fa346c703779bb9f68f703a3 WHIRLPOOL bfd1cd51197d30bfc2e7f99b36b554738d08505652f492a02254ed6369f2654ce762265d2bfb93aec398c35b1888d0900c8e9d463cf1565c3d4d8b5be9248d4e
AUX gitlab-ce-fix-redis-config-path.patch 809 SHA256 10518b34b43b934f60f4b4d36c3570d75e62f7cd4fe84a720c93d952eb739566 SHA512 9e3a607ebebdd2b2ba33835facb185217ff3b7c1930a748598419f0a7f2f49d01a73071984ccb6e46ee3333cd654b6fc189bc04346b49544a108d49fec18beeb WHIRLPOOL b015028fffce5f0e97a273e6578e5d34a034cafb65a0518a6664a60a571dee89d99fc2f776069653046e7c01d3f786201b31cd04d1ba606dd30108b4c07cceb3
AUX gitlab-ce-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208
@ -12,6 +13,6 @@ DIST gitlab-ce-8.6.7.tar.gz 16091899 SHA256 2771c5eac15e035eb50bd19da7cdd926499f
DIST gitlab-ce-8.7.0.tar.gz 17637673 SHA256 1dd06bd5ff44787ca501e6d567e962dac27d5e08c91631a60f7dce7453b0acdc SHA512 9d31b2ce618400e0da26a578a14b04ff8750a2759e2c04884823ed4a895b4de2cc33dd7d879fe831fb157783e970ef5df6ae10663202cb426eef26aeee48f925 WHIRLPOOL 5cabcd3f958a3e48c557cf2e2f53486945975afae8af27cfabcfdbbbb174aefb540611eb69257aefac42093dca583df38cbe38dba88214835a185f29dd6c5c7b
EBUILD gitlab-ce-8.6.6.ebuild 12332 SHA256 d604c907120b37873c20f2e20e603f27e36edd729e1addf7a773d15cc3ad509c SHA512 a613ba77d75f6964e8c8c0fff6c45eef52874dfbed5303004cfc5ecb697134f16aa57f8a29ad0ae46a74035fde4a3de19122af16013db2a9da29cb6b92c82b20 WHIRLPOOL fca18db3b2bc1f5b9e1835555b1766f15142a070374d533e8383c206b4c424568b80bba1b27cf91a6814b4bf287be2c6cdbdadb474770efc396bbdac801089fe
EBUILD gitlab-ce-8.6.7.ebuild 12332 SHA256 d604c907120b37873c20f2e20e603f27e36edd729e1addf7a773d15cc3ad509c SHA512 a613ba77d75f6964e8c8c0fff6c45eef52874dfbed5303004cfc5ecb697134f16aa57f8a29ad0ae46a74035fde4a3de19122af16013db2a9da29cb6b92c82b20 WHIRLPOOL fca18db3b2bc1f5b9e1835555b1766f15142a070374d533e8383c206b4c424568b80bba1b27cf91a6814b4bf287be2c6cdbdadb474770efc396bbdac801089fe
EBUILD gitlab-ce-8.7.0.ebuild 12331 SHA256 ae8dc86f7b4e115741c77eeea68b050532687a4b940d407f0c9af2171bbbcee7 SHA512 83248790ebf0f4b551819485cf5f04c2f56915e624810a6077ede22715c7ff0a91b5a3c50a31026e93ac748dfc8111b16c20ba30a2c6b2da208abb99e05a2f3d WHIRLPOOL 7d40c97d2d567d207d510faa244f4402e58e690b9df462d38adc1a2528af3d0a9f9c6b9dde90ab46b2c0506ff64e7d49391cf0fe76536ebd7066e7666b231708
EBUILD gitlab-ce-8.7.0.ebuild 12330 SHA256 7be51d548e4a21f9358c2a601c3df8be601a3c306ddb9396d2d83b0e268b7756 SHA512 30e34bbd17c868c3fdb076ac226abc36ef04e16e8c57c566a8a521a7244112039b020e2c93d578ecd4c2ea82c7646b1831402fbd67ff4e568108e5c17302b454 WHIRLPOOL 4007dfb1ab2e0eb4a45a4681b7a7ab23d6724844bc9f1f13cf77e76ef27133dfa3ed4b6a40975de27c77da581901a2d91194ca74b8be97cf4ec52d2896bc5629
EBUILD gitlab-ce-9999.ebuild 12335 SHA256 bee9135491505bf8eca8e49d39639cfba124ea407266c7b59b442a287fcc1cf1 SHA512 e17c76f4c071b60f901e6b91d10c247d0def0420598949b16e4668a1e0756de2f0c1a60da0b73bdc3de30455a47f7bb54143ee25247862917cd7830ac678c88b WHIRLPOOL d0e2d60e581e9e79ec92279744ef4ccea4df211d8750b38218b7bc00d47a566bb0a2142e2b86db0a9aaace61e554a06e53140ccd5a151a07809469ef26ec7edb
MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1

View File

@ -0,0 +1,26 @@
diff --git a/config/application.rb b/config/application.rb
index 2e2ed48..7351aa2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,7 +4,7 @@ require 'rails/all'
require 'devise'
I18n.config.enforce_available_locales = false
Bundler.require(:default, Rails.env)
-require_relative '../lib/gitlab/redis'
+require_relative '/opt/gitlab/lib/gitlab/redis'
module Gitlab
class Application < Rails::Application
diff --git a/config/mail_room.yml b/config/mail_room.yml
index 761a32a..1e2cbbb 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -2,7 +2,7 @@
<%
require "yaml"
require "json"
-require_relative "lib/gitlab/redis"
+require_relative "/opt/gitlab/lib/gitlab/redis"
rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"

View File

@ -78,7 +78,7 @@ ruby_add_bdepend "
#
RUBY_PATCHES=(
"${PN}-fix-sendmail-config.patch"
"${PN}-fix-redis-config-path.patch"
"${P}-fix-redis-config-path.patch"
)
MY_NAME="gitlab"