linux
/
gentoo-overlay
1
1
Fork 0
Code Issues 1 Pull Requests Actions Releases Wiki Activity

fixed patch for gemfile, the others applied cleanly, so i'm not gonna muck about with them.

This commit is contained in:
Manuel Friedli 2014-01-22 14:56:06 +01:00
parent 457481a0f3
commit 99e1a4fe85
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www-apps/gitlabhq/Manifest
View File

@ -3,7 +3,7 @@ AUX gitlab-unicorn-6.init 1663 SHA256 ba211c63d559cbca510483d5536d28131e08f67dc8
AUX gitlabhq-6.4.3-fix-gemfile.patch 2168 SHA256 dafa8390b1b3421d174a4f3f4e1f4fcb65be4c972aae89c4cc0f61c8492a136c SHA512 123a8f2d893159f7da235a3b7c8913686bace04eb36dbee110ebddbfbc2c4a166338e41a030f86d4b5ae7e86fdb367035b3612e62a668e365ecde1ce2e16c39a WHIRLPOOL 2ee7c88d42273d1547cdb1f27c1fe550fe29003d5f308c61d57457723658675b7cfd91fdd37a095a30810e3e55cadc1ba1b080b679875ee4bf618fd563d8dfcc
AUX gitlabhq-6.4.3-fix-project-name-regex.patch 1143 SHA256 6f12268ae65ea0fbb80a8eed0740f7270d22d2b17f7768d5d2f0feddf38301ea SHA512 3d70766c0cb0fda5f57235424633d507f30005edbf569b03af99965e26d758e7ecd3669f20c7f06350b277529f5be63e99814eed5ac74eacaec5a1f85199a25f WHIRLPOOL d2acb2ea30f44166e6164913d7345366ed9ff5646832240c6287745c1c86915b5661eaea68a3d842a363fff8301a4bcdaf71563d1c768d30c163fd396757f833
AUX gitlabhq-6.4.3-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
AUX gitlabhq-6.5.0-fix-gemfile.patch 2168 SHA256 dafa8390b1b3421d174a4f3f4e1f4fcb65be4c972aae89c4cc0f61c8492a136c SHA512 123a8f2d893159f7da235a3b7c8913686bace04eb36dbee110ebddbfbc2c4a166338e41a030f86d4b5ae7e86fdb367035b3612e62a668e365ecde1ce2e16c39a WHIRLPOOL 2ee7c88d42273d1547cdb1f27c1fe550fe29003d5f308c61d57457723658675b7cfd91fdd37a095a30810e3e55cadc1ba1b080b679875ee4bf618fd563d8dfcc
AUX gitlabhq-6.5.0-fix-gemfile.patch 2142 SHA256 801a9b4e9333a3f780cb7ad66dc0a683a6b4b8b5fab5279f63f13ef7ae307721 SHA512 64cb1e667e594072a0df1ba2f1d7f3c72add59f8d98ae6384b9bf15fcbd0f97d4f22f27f55db752090fe464044002db8c71574d8cfdcaa30d82d1ab1eb389b83 WHIRLPOOL 5f953afcf6fe4c4daf9dccc588bd588c0864ef796a0e3dd1a3466a424379f2b0510fa54ea043b641ec86d8191baaf5ccc920e293994b17fbf1078f5d299c2d79
AUX gitlabhq-6.5.0-fix-project-name-regex.patch 1143 SHA256 6f12268ae65ea0fbb80a8eed0740f7270d22d2b17f7768d5d2f0feddf38301ea SHA512 3d70766c0cb0fda5f57235424633d507f30005edbf569b03af99965e26d758e7ecd3669f20c7f06350b277529f5be63e99814eed5ac74eacaec5a1f85199a25f WHIRLPOOL d2acb2ea30f44166e6164913d7345366ed9ff5646832240c6287745c1c86915b5661eaea68a3d842a363fff8301a4bcdaf71563d1c768d30c163fd396757f833
AUX gitlabhq-6.5.0-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
DIST gitlabhq-6.4.3.tar.gz 10979694 SHA256 a2df6ec3de927a45fdaec70b806f731d66694db54dc674cd8b3378703d28114b SHA512 df06c07434ca45273e4988827d11a287249f2f3baddd799c45fafc56661ba4e1d872536f233eac7ac5aa704ddae0bcc92850af926a07f42f399873e1eda4e8f7 WHIRLPOOL 33e6199f2955fcbe65177c4f0520ceeaed82b9c1df94721048eeb8cefc798b9c83beb66f8ddec3cc91a848ba056f39e633ffba2f588880828bcae4a52d560dbc

38
www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-gemfile.patch
View File

@ -1,6 +1,6 @@
--- Gemfile.orig 2014-01-17 17:27:47.960000000 +0100
+++ Gemfile 2014-01-17 17:28:20.620000000 +0100
@@ -134,13 +134,16 @@
--- Gemfile.orig 2014-01-22 14:39:19.620000000 +0100
+++ Gemfile 2014-01-22 14:40:24.120000000 +0100
@@ -137,13 +137,16 @@
# Sanitize user input
gem "sanitize"
@ -18,8 +18,8 @@
gem 'turbolinks'
gem 'jquery-turbolinks'
--- Gemfile.lock.orig 2014-01-17 17:29:53.490000000 +0100
+++ Gemfile.lock 2014-01-17 17:33:01.660000000 +0100
--- Gemfile.lock.orig 2014-01-22 14:40:35.780000000 +0100
+++ Gemfile.lock 2014-01-22 14:52:42.590000000 +0100
@@ -1,4 +1,11 @@
GIT
+ remote: https://github.com/brianmario/charlock_holmes.git
@ -29,18 +29,18 @@
+ charlock_holmes (0.6.9.4)
+
+GIT
remote: https://github.com/gitlabhq/gon.git
revision: 58ca8e17273051cb370182cabd3602d1da6783ab
ref: 58ca8e17273051cb370182cabd3602d1da6783ab
@@ -72,7 +79,6 @@
remote: https://github.com/gitlabhq/markup.git
revision: 61ade389c1e1c159359338f570d18464a44ddbc4
ref: 61ade389c1e1c159359338f570d18464a44ddbc4
@@ -70,7 +77,6 @@
json (>= 1.7)
celluloid (0.15.2)
timers (~> 1.1.0)
- charlock_holmes (0.6.9.4)
chosen-rails (1.0.1)
coffee-rails (>= 3.2)
compass-rails (>= 1.0)
@@ -278,7 +284,6 @@
cliver (0.2.2)
code_analyzer (0.4.3)
sexp_processor
@@ -267,7 +273,6 @@
addressable (~> 2.3)
letter_opener (1.1.2)
launchy (~> 2.2)
@ -48,7 +48,7 @@
listen (2.3.1)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
@@ -412,7 +417,6 @@
@@ -401,7 +406,6 @@
redis-store (~> 1.1.0)
redis-store (1.1.4)
redis (>= 2.2)
@ -56,7 +56,7 @@
require_all (1.3.2)
rest-client (1.6.7)
mime-types (>= 1.16)
@@ -499,9 +503,6 @@
@@ -488,9 +492,6 @@
term-ansicolor (1.2.2)
tins (~> 0.8)
test_after_commit (0.2.2)
@ -66,15 +66,15 @@
thin (1.6.1)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
@@ -572,6 +573,7 @@
bootstrap-sass (~> 2.3)
@@ -561,6 +562,7 @@
bootstrap-sass (~> 3.0)
capybara
carrierwave
+ charlock_holmes!
chosen-rails (= 1.0.1)
coffee-rails
colored
@@ -655,7 +657,6 @@
coveralls
@@ -644,7 +646,6 @@
stamp
state_machine
test_after_commit