up to 8.10.2

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 1dec9b46cbf76427cdb6079a4751132278333719..51c6a7f34b82aa9fda35b7c137669a3f0246faef 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.8.5
+Version:       8.10.2
 Release:       0.37
 License:       MIT
 Group:         Applications/WWW
@@ -78,7 +78,7 @@ use on your server(s).
 %setup -qn gitlabhq-%{version}
 mv config/gitlab.yml.example config/gitlab.yml
 mv config/unicorn.rb.example config/unicorn.rb
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 #%patch2 -p1
 
@@ -86,9 +86,11 @@ mv config/unicorn.rb.example config/unicorn.rb
 mv config/database.yml.mysql config/database.yml
 
 find -name .gitkeep | xargs rm
+rm -r .github
 rm -r docker
 rm -r features
 rm -r lib/support/{deploy,init.d}
+rm -r rubocop
 rm -r scripts
 rm -r spec
 rm .csscomb.json
@@ -97,13 +99,13 @@ rm .foreman
 rm .gitattributes
 rm .gitignore
 rm .gitlab-ci.yml
-rm .hound.yml
 rm .pkgr.yml
 rm .rspec
 rm .rubocop.yml
+rm .rubocop_todo.yml
 rm .scss-lint.yml
 rm .simplecov
-rm .teatro.yml
+rm .vagrant_enabled
 rm Procfile
 rm bin/pkgr_before_precompile.sh
 rm docker-compose.yml
@@ -120,8 +122,11 @@ bundle install %{_smp_mflags} \
        --deployment \
        --without development test aws %{!?with_krb5:kerberos}
 
+# precompile assets
+# use modified config so it doesn't croak
 cp -p config/gitlab.yml{,.production}
 sed -i -e '/secret_file:/d' config/gitlab.yml
+sed -i -e 's#/home/git/repositories/#./#' config/gitlab.yml
 bundle exec rake RAILS_ENV=production assets:clean assets:precompile USE_DB=false
 mv -f config/gitlab.yml{.production,}
 

diff --git a/pld.patch b/pld.patch
index ea274351ad92718a99c7c2a1f4f80e9743fff782..5b192dc15836bbf1c328044e8984d2eed03d824e 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- gitlabhq-8.7.5.paths/config/gitlab.yml     2016-05-15 21:30:47.260578333 +0300
-+++ gitlabhq-8.7.5/config/gitlab.yml   2016-05-15 10:55:03.000000000 +0300
+--- gitlabhq-8.10.2/config/gitlab.yml~ 2016-07-28 14:33:30.000000000 +0300
++++ gitlabhq-8.10.2/config/gitlab.yml  2016-07-28 14:34:15.268930594 +0300
 @@ -56,7 +56,7 @@
        #- 2001:0db8::/32
  
@@ -18,17 +18,13 @@
  
    ## Backup settings
    backup:
-@@ -437,15 +437,15 @@
+@@ -458,12 +458,12 @@
  
    ## GitLab Shell settings
    gitlab_shell:
 -    path: /home/git/gitlab-shell/
-+    path: /usr/share/gitlab-shell/
- 
-     # REPOS_PATH MUST NOT BE A SYMLINK!!!
--    repos_path: /home/git/repositories/
 -    hooks_path: /home/git/gitlab-shell/hooks/
-+    repos_path: /var/lib/gitlab/repositories/
++    path: /usr/share/gitlab-shell/
 +    hooks_path: /usr/share/gitlab-shell/hooks/
  
      # File that contains the secret key for verifying access for gitlab-shell.