up to 8.11

https://about.gitlab.com/2016/08/22/gitlab-8-11-released/

diff --git a/clean-vendor.sh b/clean-vendor.sh
index 549da056cf6d7c69c78824c26d860f234d90f9bc..8484c118e03888599311800ff6906f8b38926492 100755 (executable)
--- a/clean-vendor.sh
+++ b/clean-vendor.sh
@@ -17,12 +17,12 @@ clean_rootfiles() {
        rm .gitattributes
        rm .gitignore
        rm .gitlab-ci.yml
+       rm .mailmap
        rm .pkgr.yml
        rm .rspec
        rm .rubocop.yml
        rm .rubocop_todo.yml
        rm .scss-lint.yml
-       rm .simplecov
        rm .vagrant_enabled
        rm Procfile
        rm bin/pkgr_before_precompile.sh

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index a80bcf4ac5059f459af7488cc23a7a8c4e4820cd..bd7ff5268815423566442836f4121f66002b9b29 100644 (file)
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -16,8 +16,8 @@
 
 Summary:       A Web interface to create projects and repositories, manage access and do code reviews
 Name:          gitlab-ce
-Version:       8.10.7
-Release:       0.59
+Version:       8.11.0
+Release:       0.60
 License:       MIT
 Group:         Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -54,7 +54,7 @@ BuildRequires:        zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires:      apache-base
 Requires:      git-core >= 2.7.4
-Requires:      gitlab-shell >= 3.2.1
+Requires:      gitlab-shell >= 3.4.0
 Requires:      nodejs
 Requires:      rc-scripts
 Requires:      ruby-bundler
@@ -133,7 +133,6 @@ chmod a-x vendor/bundle/ruby/gems/unicorn-*/bin/unicorn*
 
 # remove secrets, log and cache that assets compile initialized
 rm .gitlab_shell_secret
-rm .secret
 rm config/secrets.yml
 rm log/production.log
 rm -r tmp/cache/*