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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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