commit b8aa93cfe3fb84da5c43fbf75b47f5201638865c
Author: Elan Ruusamäe <[email protected]>
Date: Thu Sep 22 21:34:25 2016 +0300
up to 8.12.0
https://about.gitlab.com/2016/09/22/gitlab-8-12-released/
clean-vendor.sh | 3 +++
gitlab-ce.spec | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 5c6125e..3c080e6 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -16,7 +16,7 @@
Summary: A Web interface to create projects and repositories, manage
access and do code reviews
Name: gitlab-ce
-Version: 8.11.7
+Version: 8.12.0
Release: 0.74
License: MIT
Group: Applications/WWW
@@ -199,6 +199,7 @@ move_symlink() {
for f in gitlab.yml unicorn.rb database.yml secrets.yml; do
move_symlink %{appdir}/config/$f %{_sysconfdir}/gitlab/$f
done
+move_symlink %{appdir}/.gitlab_workhorse_secret
%{_sysconfdir}/gitlab/.gitlab_workhorse_secret
cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/gitlab/.gitconfig
ln -s %{_sysconfdir}/gitlab/.gitconfig $RPM_BUILD_ROOT%{vardir}/.gitconfig
@@ -286,6 +287,8 @@ fi
%config(noreplace) %verify(not md5 mtime size) %attr(640,%{uname},%{gname})
%{_sysconfdir}/gitlab/schema.rb
%config(noreplace) %verify(not md5 mtime size) %attr(640,%{uname},%{gname})
%{_sysconfdir}/gitlab/secrets.yml
%config(noreplace) %verify(not md5 mtime size) %attr(640,%{uname},%{gname})
%{_sysconfdir}/gitlab/.gitconfig
+%config(noreplace) %verify(not md5 mtime size) %attr(640,%{uname},%{gname})
%{_sysconfdir}/gitlab/.gitlab_workhorse_secret
+
%ghost %{_sysconfdir}/gitlab/skip-auto-migrations
%config(noreplace) %verify(not md5 mtime size) /etc/httpd/webapps.d/gitlab.conf
/etc/logrotate.d/gitlab.logrotate
@@ -304,6 +307,7 @@ fi
# files
%{appdir}/*.md
%{appdir}/.bundle
+%{appdir}/.gitlab_workhorse_secret
%{appdir}/.ruby-version
%{appdir}/CHANGELOG
%{appdir}/GITLAB_SHELL_VERSION
diff --git a/clean-vendor.sh b/clean-vendor.sh
index 805a542..c6d4a82 100755
--- a/clean-vendor.sh
+++ b/clean-vendor.sh
@@ -5,6 +5,8 @@ set -e
clean_rootfiles() {
cd $root
rm -r .github
+ rm -r .gitlab
+ rm -r changelogs
rm -r docker
rm -r features
rm -r lib/support/{deploy,init.d}
@@ -17,6 +19,7 @@ clean_rootfiles() {
rm .gitattributes
rm .gitignore
rm .gitlab-ci.yml
+ rm .haml-lint.yml
rm .mailmap
rm .pkgr.yml
rm .rspec
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/b8aa93cfe3fb84da5c43fbf75b47f5201638865c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
