summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2018-08-10 12:26:07 +0300
committerCaleb Maclennan2018-08-10 12:27:36 +0300
commitef7d1e352d279149196adcd122f9ab3246d6d2e7 (patch)
tree825a14fb2431b9cd640d49b8860dde523ffb5dcd
parent70c46d5715892538d171a4273d920afe26c728cc (diff)
downloadaur-ef7d1e352d279149196adcd122f9ab3246d6d2e7.tar.gz
Cleanup repository and update ignores
-rw-r--r--.gitignore19
-rw-r--r--a951b96be2862ce660dc715a364f574c2f5f72e1.patch28
2 files changed, 13 insertions, 34 deletions
diff --git a/.gitignore b/.gitignore
index b73f45316f95..ef6c23d492eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,13 @@
-pkg/
-src/
-*.pkg.tar*
-*.bz2
-*.tar
-*.gz
+!./.SRCINFO
+!./.gitignore
+!./PKGBUILD
+!./gitlab-backup.service
+!./gitlab-backup.timer
+!./gitlab-mailroom.service
+!./gitlab-sidekiq.service
+!./gitlab-unicorn.service
+!./gitlab.install
+!./gitlab.logrotate
+!./gitlab.target
+!./gitlab.tmpfiles.d
+*
diff --git a/a951b96be2862ce660dc715a364f574c2f5f72e1.patch b/a951b96be2862ce660dc715a364f574c2f5f72e1.patch
deleted file mode 100644
index 90da889377ae..000000000000
--- a/a951b96be2862ce660dc715a364f574c2f5f72e1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a951b96be2862ce660dc715a364f574c2f5f72e1 Mon Sep 17 00:00:00 2001
-From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
-Date: Fri, 30 Mar 2018 12:32:26 +0200
-Subject: [PATCH] Update charlock_holmes to 0.76
-
-Didn't compile against newer icu4c versions and was fixed upstream in
-https://github.com/brianmario/charlock_holmes/pull/129, which was
-releaed in the versions its now locked to.
----
- Gemfile.lock | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Gemfile.lock b/Gemfile.lock
-index fcffe45..5271d65 100644
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -120,7 +120,7 @@ GEM
- activesupport (>= 4.0.0)
- mime-types (>= 1.16)
- cause (0.1)
-- charlock_holmes (0.7.5)
-+ charlock_holmes (0.7.6)
- childprocess (0.7.0)
- ffi (~> 1.0, >= 1.0.11)
- chronic (0.10.2)
---
-libgit2 0.26.0
-