Merge branch 'master' into feature/gitlab-6.9.2

Conflicts:
	www-apps/gitlabhq/Manifest
This commit is contained in:
Manuel Friedli 2014-07-20 21:25:26 +02:00
commit d0434ed0c9
2 changed files with 1 additions and 5 deletions

View File

@ -35,5 +35,5 @@ DIST gitlabhq-6.7.5.tar.gz 10229484 SHA256 547ed2807cccf08c11450a9df035dad8db66a
DIST gitlabhq-6.8.2.tar.gz 10558471 SHA256 db9400d5ffadd3564bbee6e388c90d7f4c8f88450e67213aad11df2d137534ec SHA512 0f57c6bb3b9e89a5bbf7ae4c774e54480518f185f2e50270a7dd921eb2a2322f3e6866ca70741582fad4f99b372ba025fbab15108c291d53ebf04cfaec2f9b75 WHIRLPOOL 73ebd0fb0faef7afd48398ec4e73c8f4175f3dc2a9450ae391b4d3a66b54e0d77f901f518738eb98cc267691559094d4ebecd4c0a7c18fa671c3a1aee4dfe4d2
DIST gitlabhq-6.9.2.tar.gz 10566288 SHA256 2c01b223c3e889c7a45d3815f352c0546a337286d395e4d49df5ecedc1a57dc0 SHA512 b51b4e261666c14f782ce7edbbda24b6d32bb080c5444249f5c38e5233398b30f50a17cc8cbee18d75e57ba11ec3deeab4ffd1a6d6257c1858f8fe63e5138e54 WHIRLPOOL a3b9a8149fab69443b769aa145eb2c9a99bfc9f4a080edf0a6bd46c4771247b6f1c729bf5185e63bf63a02d654145362b7c8e9fefef6f0cdf1f4f30a32cf9dcb
EBUILD gitlabhq-6.7.5.ebuild 10983 SHA256 79fe5e03f1f03625a27d5ef398bb4d40e991c71490eda27913529bcdebf03b5d SHA512 73d035742868747f4d1dbbdce0d2892e29bbea3fd2938a66d16c9c72e3ec6075c9faa855b8a46b7970a8879e9633a25b65d70f3cc9eb77a2656bcbcca64f6008 WHIRLPOOL b8a9531f544799a141b7c6ddfaea6cce5d2643832c38326ff13bb3ed37f009b0bb1aeeba3d1d2434d2e59b43747c380ea505fbebb1a082da94a4e2322f20f4bf
EBUILD gitlabhq-6.8.2.ebuild 10759 SHA256 11597b1d6054f704b64e9f9c542e8cb519423d56bb71ad371959061fc5cc8a45 SHA512 587b4e544f01e1187e0071aa95cb10c86d4fd5ebb1d2d7d8ce46e8f09079a47b699ee853da33270cd3919d21c5444783be7890c5ca16af455ce3f97b36e70e24 WHIRLPOOL f4b68eb7c9b49de63247d6d5b834021f9576c4bca44f855a93cff3cec31e18ac4b286d4e9bca4bbd9720b275e1dcd2568db5d520162482f595d3f9abb48171b3
EBUILD gitlabhq-6.8.2.ebuild 10574 SHA256 01e27412382c97f98ac275bdf34fba3492c568039a8863a1b67ede49f64208c8 SHA512 4175ab3407c7c927cd041706232c7f525948ebef0722f420981de2145c3f8be5aca2a6d0cd1b6d17d0944d5f3a53d621013174793193c9dcb8cac9cfa075c799 WHIRLPOOL 0e59c26150b2f162a42191ca1400ee79e5b2654c6a7f5696ea7f9bf2d6236e14439626125e66d0c8b1cb56c704e55c1b31a6e7cb65fa63be83a97032cfa72030
EBUILD gitlabhq-6.9.2.ebuild 10587 SHA256 b6ecde09ca853838e097abfae46a3ab15f7e01c84e03eb1d35e47cee57e62f3f SHA512 5b4615e807d5788e3f424eda19f88b5f523137bafaada466fee281e1816ba0f2ef9316ace7ed69de2e22234804f1255a09ec93219253532d582ad6fb36d00477 WHIRLPOOL b6b30bf01aa4d11424c0cdbff019260f5f992f89a5b8360c6055c199870f3b9b621891894f1d7d5001b63a2ba6d199d9b5dda7acfd51cef8603d86c671871c26

View File

@ -131,10 +131,6 @@ all_ruby_prepare() {
rm ${dbconf}.postgresql
fi
# remove zzet's stupid migration which expetcs that users are so foolish
# to run GitLab with PostgreSQL's superuser...
rm db/migrate/20121009205010_postgres_create_integer_cast.rb
# remove useless files
rm -r lib/support/{deploy,init.d}
rm -r script/{background_jobs,web}