up to 8.12.0

https://about.gitlab.com/2016/09/22/gitlab-8-12-released/

diff --git a/clean-vendor.sh b/clean-vendor.sh
index 805a542bcd8a7c7f620e892d6a24e2f68cdee44a..c6d4a820797923b4405492c0cc0728a5d49dd87b 100755 (executable)
--- 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

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 5c6125ee7f3f6b4593a7feec45ae87c1acc3dff0..3c080e60b3357c062c541b2e18b363c464d93e1d 100644 (file)
--- 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