deleted old version of gitlab{hq,-ci}

2015-09-29 00:02:46 +02:00 · 2015-09-29 00:02:46 +02:00 · 3d642bf08d
commit 3d642bf08d
parent 038dfac767
20 changed files with 2 additions and 5483 deletions
--- a/www-apps/gitlabhq/files/gitlabhq-fix-gemfile.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-fix-gemfile.patch
@ -1,57 +0,0 @@
-diff --git a/Gemfile b/Gemfile
-index f697f09..d557a18 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"
- 
-@@ -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
-+++ 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