fixed gemfile patch for gitlabhq-7.9.3

This commit is contained in:
Manuel Friedli 2015-05-09 20:46:46 +02:00
parent c8b2f56041
commit 8ce1382a0d
2 changed files with 12 additions and 2 deletions

View file

@ -48,7 +48,7 @@ AUX gitlabhq-7.7.1-fix-project-name-regex.patch 715 SHA256 b026094b1f910226ddef2
AUX gitlabhq-7.8.0-email-custom-reply_to.patch 1853 SHA256 ccf123b164fa323a212bb2b53104e0dc8d1bd0ecbc0a0dc3b41fa58740ba6779 SHA512 67b4f4624bd7fe91b78b28b2265f7166110611fe2a32ded733aff65291e7562af4bd3b0d3345a45991a537486eda4606cd82347b907b09c6ff47d55d40969227 WHIRLPOOL 678716e8dfa794055a7d4827a7f1e9bc67475738ed7308d5cc28a7661a99acf927cb91a59dd01055cdbde9690bb3dc10b87c53569351267dea2e86117140af5e
AUX gitlabhq-7.8.0-fix-gemfile.patch 2123 SHA256 935a72dd9cdbb12de6c95ca5e3fba066b5fcf368830f9e4c7ce4466feab20400 SHA512 70960437b1e5e5054ee28134104a1cabdf95ac6a7f034f755f97eb859d526662ab9e6313fd1c72b6838c308df5173a0d08896f137f8f737c6c0a6e7b7f54bfc3 WHIRLPOOL 8d7cbc26934f2d0e993c75565a17992c3c44a7ab51e6154bf7a91667e0e1c5837cb6546730bea882772b042c6353459f20e59a9a95d56d130f6db8ce4d2d1123
AUX gitlabhq-7.9.3-email-custom-reply_to.patch 1787 SHA256 278b23ce845f39a4342af8647a5453f69a34769c14bb221b250bbff9f59dea4d SHA512 d98ca57a7c1a46c6af8ffd86973cb0c7646dd7545b7ee17bafc3e025cc3be01b4a9f876a1b505be9b098054a194bd14ec79cd8d633afbdc74d845e376460a55a WHIRLPOOL 52298d14cefed3d86bf183524561101a5795b5de9ee33611196019fcb4bc43975f0330dba187eb16d8a96eb4cc865c8e38fbcd351d19b290d79f4fb2e4f78b11
AUX gitlabhq-7.9.3-fix-gemfile.patch 1231 SHA256 c98449efc6e7fc248cf1824a1e8bd0a100ad246de76f170ddd7e4a05227099b7 SHA512 91899307ed209abb014fb595f57b34fa6edc437ec9922c0fb49715bf12991d0662348024b27195a564926792ba1ba35362d4e4e79b0fa213fbb7bae76076ce83 WHIRLPOOL a62396eede6bdc6c65d23c34af34fe8dd8b0caef8fe0c7d55a4663cefd1fd150084a3d0a16db699bd7fa79a459b575619abd107fd849c566c4a2c3faa224a31f
AUX gitlabhq-7.9.3-fix-gemfile.patch 1456 SHA256 ad7deb355b74a156ef04c031ff45946a4852d273b30c4bae2be5b2cb11d0d683 SHA512 f0535f57338833f734701ab9c64a1a1dc9f7d6e7c634756c18e98bd5c6811876e2cbc7d64bd93297d5717d1d1e4f9213c7982c32770000698dc7a718a7b00155 WHIRLPOOL dfc2083e7c3c7895a01f4e1e588610f542a38a636ce9af1165b5c0fa4301fa91a6b58f24833ab9e754ea3024e48894b6b58ee9e3d2acec6cddcc1ecc515b097b
DIST gitlabhq-6.7.5.tar.gz 10229484 SHA256 547ed2807cccf08c11450a9df035dad8db66ab9f9d693db29e3aa1ee65edbae0 SHA512 a90c0cd3954bf20ece9e98626216a42afcb0cc07e0cb23874ab2065757805ac38a8dcf4e93d804a33caeecaf2c6e94d8566f5700cd4161ef9a0aaac089b9ded8 WHIRLPOOL 4d8f5ff3a1245c5e13fc3ff8f819160017dd4dba9f6a48c0f851272da5c97f45162d3e53f327002f1ecde7f31dd5f392bed8503b1b306d913bf63827777cdbcd
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

View file

@ -1,5 +1,5 @@
diff --git a/Gemfile b/Gemfile
index f697f09..770b7b0 100644
index f697f09..d557a18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -168,6 +168,10 @@ gem "underscore-rails", "~> 1.4.4"
@ -13,6 +13,16 @@ index f697f09..770b7b0 100644
# Protect against bruteforcing
gem "rack-attack"
@@ -177,9 +181,6 @@ gem 'ace-rails-ap'
# Keyboard shortcuts
gem 'mousetrap-rails'
-# Detect and convert string character encoding
-gem 'charlock_holmes'
-
gem "sass-rails", '~> 4.0.2'
gem "coffee-rails"
gem "uglifier"
diff --git a/Gemfile.lock b/Gemfile.lock
index c38daf6..067fc86 100644
--- a/Gemfile.lock