www/gitlab: Update from 8.8.7 to 8.9.6

Changes: https://github.com/gitlabhq/gitlabhq/blob/v8.9.6/CHANGELOG

Approved by: junovitch (mentor, implicit)
This commit is contained in:
Torsten Zuehlsdorff 2016-08-10 14:30:22 +00:00
parent c312edc51a
commit c488755cf7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=420031
11 changed files with 494 additions and 171 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab
PORTVERSION= 8.8.7
PORTVERSION= 8.9.6
DISTVERSIONPREFIX= v
CATEGORIES= www devel
@ -12,9 +12,12 @@ COMMENT= Web GUI for managing git repositories
LICENSE= MIT
BUILD_DEPENDS= gem:devel/ruby-gems
# the rubygems of RUN_DEPENDS matches the order of the Gemfile
# which makes maintaining this long list much easier!
RUN_DEPENDS= git>=2.7.4:devel/git \
gitlab-shell>=2.7.0:devel/gitlab-shell\
gitlab-workhorse>=0.7.1:www/gitlab-workhorse \
gitlab-shell>=3.0.0:devel/gitlab-shell\
gitlab-workhorse>=0.7.5:www/gitlab-workhorse \
redis>=2.8.23:databases/redis \
rubygem-rails4>=4.2.6:www/rubygem-rails4 \
rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \
@ -22,9 +25,8 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-sprockets3>=3.6:devel/rubygem-sprockets3 \
rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \
rubygem-pg>=0.18.2:databases/rubygem-pg \
rubygem-devise-rails4>=3.5.4:devel/rubygem-devise-rails4 \
rubygem-devise-rails4>=4.0:devel/rubygem-devise-rails4 \
rubygem-doorkeeper>=3.1:security/rubygem-doorkeeper \
rubygem-devise-async-rails4>=0.9.0:devel/rubygem-devise-async-rails4 \
rubygem-omniauth>=1.3.1:security/rubygem-omniauth \
rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \
rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \
@ -40,13 +42,14 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \
rubygem-jwt>=1.0:www/rubygem-jwt \
rubygem-recaptcha>=0:devel/rubygem-recaptcha \
rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \
rubygem-akismet>=2.0:devel/rubygem-akismet \
rubygem-devise-two-factor>=2.0.0:security/rubygem-devise-two-factor \
rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \
rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \
rubygem-attr_encrypted>=1.3.4:security/rubygem-attr_encrypted \
rubygem-browser>=1.0.0:www/rubygem-browser \
rubygem-gitlab_git>=10.0:devel/rubygem-gitlab_git \
rubygem-attr_encrypted>=3.0.0:security/rubygem-attr_encrypted \
rubygem-u2f>=0.2.1:net/rubygem-u2f \
rubygem-browser>=2.2:www/rubygem-browser \
rubygem-gitlab_git>=10.2:devel/rubygem-gitlab_git \
rubygem-gitlab_omniauth-ldap>=1.2.1:net/rubygem-gitlab_omniauth-ldap \
rubygem-gollum-lib>=4.1.0:www/rubygem-gollum-lib \
rubygem-gollum-rugged_adapter>=0.4.2:www/rubygem-gollum-rugged_adapter \
@ -54,11 +57,16 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-grape>=0.13.0:devel/rubygem-grape \
rubygem-grape-entity>=0.4.2:devel/rubygem-grape-entity \
rubygem-rack-cors>=0.4.0:www/rubygem-rack-cors \
rubygem-kaminari-rails4>=0.16.3:www/rubygem-kaminari-rails4 \
rubygem-kaminari-rails4>=0.17.0:www/rubygem-kaminari-rails4 \
rubygem-haml-rails-rails4>=0.9.0:www/rubygem-haml-rails-rails4 \
rubygem-carrierwave>=0.10.0:www/rubygem-carrierwave \
rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
rubygem-fog>=1.36:devel/rubygem-fog \
rubygem-fog-aws>=0.9:net/rubygem-fog-aws \
rubygem-fog-azure>=0.0:net/rubygem-fog-azure \
rubygem-fog-core>=1.40:devel/rubygem-fog-core \
rubygem-fog-local>=0.3:net/rubygem-fog-local \
rubygem-fog-google>=0.3:net/rubygem-fog-google \
rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \
rubygem-unf>=0.1.4:textproc/rubygem-unf \
rubygem-six>=0.2.0:security/rubygem-six \
rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \
@ -66,18 +74,18 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-task_list>=1.0.2:www/rubygem-task_list \
rubygem-github-markup>=1.3.1:textproc/rubygem-github-markup \
rubygem-redcarpet>=3.3.3:textproc/rubygem-redcarpet \
rubygem-redcloth>=4.2.9:www/rubygem-redcloth \
rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
rubygem-rdoc>=3.6:devel/rubygem-rdoc \
rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \
rubygem-creole>=0.5.0:textproc/rubygem-creole \
rubygem-wikicloth>=0.8.1:textproc/rubygem-wikicloth \
rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \
rubygem-rouge>=1.10.1:textproc/rubygem-rouge \
rubygem-rouge>=1.11:textproc/rubygem-rouge \
rubygem-nokogiri>=1.6.7.2:textproc/rubygem-nokogiri \
rubygem-diffy>=3.0.3:textproc/rubygem-diffy \
rubygem-unicorn>=4.9.0:www/rubygem-unicorn \
rubygem-unicorn-worker-killer>=0.4.2:www/rubygem-unicorn-worker-killer \
rubygem-state_machines-activerecord>=0.3.0:databases/rubygem-state_machines-activerecord \
rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \
rubygem-after_commit_queue>=0:databases/rubygem-after_commit_queue \
rubygem-acts-as-taggable-on3>=3.4.0:www/rubygem-acts-as-taggable-on3 \
rubygem-sinatra>=1.4.4:www/rubygem-sinatra \
@ -85,7 +93,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-sidekiq-cron>=0.4.0:devel/rubygem-sidekiq-cron \
rubygem-redis-namespace>=0:databases/rubygem-redis-namespace \
rubygem-httparty>=0.13.3:www/rubygem-httparty \
rubygem-colorize>=0.7.0:devel/rubygem-colorize \
rubygem-rainbow>=2.1.0:devel/rubygem-rainbow \
rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
rubygem-version_sorter>=2.0.0:textproc/rubygem-version_sorter \
rubygem-redis-rails>=4.0.0:www/rubygem-redis-rails \
@ -99,7 +107,6 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-asana>=0.4.0:www/rubygem-asana \
rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
rubygem-cal-heatmap-rails-rails4>=3.6.0:www/rubygem-cal-heatmap-rails-rails4 \
rubygem-underscore-rails>=1.8.0:www/rubygem-underscore-rails \
rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
@ -109,6 +116,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-ace-rails-ap>=4.0.2:www/rubygem-ace-rails-ap \
rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \
rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \
rubygem-uglifier>=2.7.2:www/rubygem-uglifier \
@ -116,13 +124,12 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-jquery-turbolinks>=2.1.0:www/rubygem-jquery-turbolinks \
rubygem-addressable>=2.3.8:www/rubygem-addressable \
rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \
rubygem-font-awesome-rails-rails4>=4.2:devel/rubygem-font-awesome-rails-rails4 \
rubygem-font-awesome-rails-rails4>=4.6.1:devel/rubygem-font-awesome-rails-rails4 \
rubygem-gitlab_emoji>=0.3:graphics/rubygem-gitlab_emoji \
rubygem-gon>=6.0.1:www/rubygem-gon \
rubygem-jquery-atwho-rails-rails4>=1.3.2:www/rubygem-jquery-atwho-rails-rails4 \
rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \
rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \
rubygem-raphael-rails>=2.1.2:www/rubygem-raphael-rails \
rubygem-request_store>=1.3.0:devel/rubygem-request_store \
rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \
rubygem-virtus>=1.0.1:devel/rubygem-virtus \
@ -135,10 +142,10 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-newrelic-grape>=0:devel/rubygem-newrelic-grape \
rubygem-newrelic_rpm>=3.14:devel/rubygem-newrelic_rpm \
rubygem-octokit>=4.3.0:net/rubygem-octokit \
rubygem-mail_room>=0.7:mail/rubygem-mail_room \
rubygem-mail_room>=0.8:mail/rubygem-mail_room \
rubygem-email_reply_parser>=0.5.8:mail/rubygem-email_reply_parser \
rubygem-activerecord-deprecated_finders>=1.0.3:devel/rubygem-activerecord-deprecated_finders \
rubygem-activerecord-session_store>=0.1.0:databases/rubygem-activerecord-session_store \
rubygem-activerecord-session_store>=1.0.0:databases/rubygem-activerecord-session_store \
rubygem-nested_form>=0.3.2:www/rubygem-nested_form \
rubygem-oauth2>=1.0.0:net/rubygem-oauth2 \
rubygem-paranoia>=2.0:databases/rubygem-paranoia \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1467811812
SHA256 (gitlabhq-gitlabhq-v8.8.7_GH0.tar.gz) = 42ecd49943c879006d6042583b2e55f31a8f4b11d04faf693e1b1fe594697e4d
SIZE (gitlabhq-gitlabhq-v8.8.7_GH0.tar.gz) = 18479391
TIMESTAMP = 1468919497
SHA256 (gitlabhq-gitlabhq-v8.9.6_GH0.tar.gz) = 1b357ed1157a2a20b647004f588b67d72416df805a385fa7b605905bafb26f55
SIZE (gitlabhq-gitlabhq-v8.9.6_GH0.tar.gz) = 21555571

View File

@ -1,4 +1,4 @@
--- Gemfile.orig 2016-06-15 01:41:18 UTC
--- Gemfile.orig 2016-07-11 19:38:44 UTC
+++ Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
@ -8,7 +8,7 @@
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
@@ -8,19 +8,18 @@ gem 'responders', '~> 2.0'
@@ -8,13 +8,12 @@ gem 'responders', '~> 2.0'
# Specify a sprockets version due to increased performance
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
@ -24,14 +24,7 @@
gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
gem 'devise', '~> 3.5.4'
gem 'doorkeeper', '~> 3.1'
-gem 'devise-async', '~> 0.9.0'
+gem 'devise-async', '>= 0.9.0'
gem 'omniauth', '~> 1.3.1'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
@@ -29,13 +28,12 @@ gem 'omniauth-cas3', '~> 1.1.2'
@@ -28,13 +27,12 @@ gem 'omniauth-cas3', '~> 1.1.2'
gem 'omniauth-facebook', '~> 3.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.0'
@ -47,22 +40,6 @@
gem 'jwt'
# Spam and anti-bot protection
@@ -43,12 +41,12 @@ gem 'recaptcha', require: 'recaptcha/rai
gem 'akismet', '~> 2.0'
# Two-factor authentication
-gem 'devise-two-factor', '~> 2.0.0'
+gem 'devise-two-factor', '>= 2.0.0'
gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 1.3.4'
+gem 'attr_encrypted', '>= 1.3.4'
# Browser detection
-gem "browser", '~> 1.0.0'
+gem "browser", '>= 1.0.0'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
@@ -61,15 +59,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1',
# Git Wiki
@ -83,7 +60,7 @@
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Pagination
@@ -79,13 +77,13 @@ gem "kaminari", "~> 0.16.3"
@@ -79,7 +77,7 @@ gem "kaminari", "~> 0.17.0"
gem "haml-rails", '~> 0.9.0'
# Files attachments
@ -92,21 +69,14 @@
# Drag and Drop UI
gem 'dropzonejs-rails', '~> 0.7.1'
# for aws storage
-gem "fog", "~> 1.36.0"
+gem "fog", ">= 1.36.0"
gem "unf", '~> 0.1.4'
# Authorization
@@ -97,13 +95,13 @@ gem "seed-fu", '~> 2.3.5'
@@ -104,26 +102,26 @@ gem "seed-fu", '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
-gem 'github-markup', '~> 1.3.1'
+gem 'github-markup', '>= 1.3.1'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.2.9'
gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~>3.6'
+gem 'rdoc', '>= 3.6'
gem 'org-ruby', '~> 0.9.12'
@ -114,9 +84,11 @@
-gem 'wikicloth', '0.8.1'
+gem 'wikicloth', '>= 0.8.1'
gem 'asciidoctor', '~> 1.5.2'
gem 'rouge', '~> 1.10.1'
-gem 'rouge', '~> 1.11'
+gem 'rouge', '>= 1.11'
@@ -112,16 +110,16 @@ gem 'rouge', '~> 1.10.1'
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
# Diffs
@ -130,13 +102,7 @@
gem 'unicorn-worker-killer', '~> 0.4.2'
end
# State machine
-gem "state_machines-activerecord", '~> 0.3.0'
+gem "state_machines-activerecord", '>= 0.3.0'
# Run events after state machine commits
gem 'after_commit_queue'
@@ -167,10 +165,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
@@ -174,10 +172,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
gem "gemnasium-gitlab-service", "~> 0.2"
# Slack integration
@ -149,7 +115,7 @@
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
@@ -185,17 +183,17 @@ gem 'cal-heatmap-rails', '~> 3.6.0'
@@ -189,17 +187,17 @@ gem 'd3_rails', '~> 3.5.0'
gem "underscore-rails", "~> 1.8.0"
# Sanitize user input
@ -170,7 +136,7 @@
# Ace editor
gem 'ace-rails-ap', '~> 4.0.2'
@@ -208,11 +206,11 @@ gem 'charlock_holmes', '~> 0.7.3'
@@ -215,11 +213,11 @@ gem 'chronic_duration', '~> 0.10.6'
gem "sass-rails", '~> 5.0.0'
gem "coffee-rails", '~> 4.1.0'
@ -182,12 +148,12 @@
-gem 'addressable', '~> 2.3.8'
+gem 'addressable', '>= 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'font-awesome-rails', '~> 4.6.1'
gem 'gitlab_emoji', '~> 0.3.0'
@@ -221,10 +219,10 @@ gem 'jquery-atwho-rails', '~> 1.3.2'
@@ -227,10 +225,10 @@ gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.1.0'
gem 'jquery-ui-rails', '~> 5.0.0'
gem 'raphael-rails', '~> 2.1.2'
-gem 'request_store', '~> 1.3.0'
+gem 'request_store', '>= 1.3.0'
gem 'select2-rails', '~> 3.5.9'
@ -197,7 +163,7 @@
gem 'base32', '~> 0.3.0'
# Sentry integration
@@ -232,86 +230,6 @@ gem 'sentry-raven', '~> 0.15'
@@ -238,90 +236,6 @@ gem 'sentry-raven', '~> 0.15'
gem 'premailer-rails', '~> 1.9.0'
@ -210,7 +176,7 @@
-
-group :development do
- gem "foreman"
- gem 'brakeman', '~> 3.2.0', require: false
- gem 'brakeman', '~> 3.3.0', require: false
-
- gem 'letter_opener_web', '~> 1.3.0'
- gem 'quiet_assets', '~> 1.0.2'
@ -262,15 +228,19 @@
- gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'spring-commands-teaspoon', '~> 0.0.2'
-
- gem 'rubocop', '~> 0.38.0', require: false
- gem 'rubocop', '~> 0.40.0', require: false
- gem 'rubocop-rspec', '~> 1.5.0', require: false
- gem 'scss_lint', '~> 0.47.0', require: false
- gem 'coveralls', '~> 0.8.2', require: false
- gem 'coveralls', '~> 0.8.2', require: false
- gem 'simplecov', '~> 0.11.0', require: false
- gem 'flog', require: false
- gem 'flay', require: false
- gem 'bundler-audit', require: false
-
- gem 'benchmark-ips', require: false
-
- gem "license_finder", require: false
- gem 'knapsack'
-end
-
-group :test do
@ -284,7 +254,7 @@
group :production do
gem "gitlab_meta", '7.0'
end
@@ -329,10 +247,12 @@ gem 'activerecord-session_store', '~> 0.
@@ -339,10 +253,12 @@ gem 'activerecord-session_store', '~> 1.
gem "nested_form", '~> 0.3.2'
# OAuth

View File

@ -1,4 +1,4 @@
--- config/database.yml.postgresql.orig 2016-04-22 10:01:37 UTC
--- config/database.yml.postgresql.orig 2016-07-11 19:38:44 UTC
+++ config/database.yml.postgresql
@@ -6,7 +6,7 @@ production:
encoding: unicode

View File

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2016-06-15 01:41:18 UTC
--- config/gitlab.yml.example.orig 2016-07-11 19:38:44 UTC
+++ config/gitlab.yml.example
@@ -448,11 +448,11 @@ production: &base
@@ -451,11 +451,11 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -15,7 +15,7 @@
# File that contains the secret key for verifying access for gitlab-shell.
# Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -469,7 +469,7 @@ production: &base
@@ -472,7 +472,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:

View File

@ -1,4 +1,4 @@
--- config/initializers/1_settings.rb.orig 2016-06-15 01:41:18 UTC
--- config/initializers/1_settings.rb.orig 2016-07-11 19:38:44 UTC
+++ config/initializers/1_settings.rb
@@ -191,12 +191,8 @@ Settings.gitlab['email_reply_to'] ||= EN
Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url)

View File

@ -1,4 +1,4 @@
--- config/unicorn.rb.example.orig 2016-04-22 10:01:37 UTC
--- config/unicorn.rb.example.orig 2016-07-11 19:38:44 UTC
+++ config/unicorn.rb.example
@@ -33,12 +33,12 @@ worker_processes 3

View File

@ -1,4 +1,4 @@
--- lib/support/nginx/gitlab.orig 2016-06-15 01:41:18 UTC
--- lib/support/nginx/gitlab.orig 2016-07-11 19:38:44 UTC
+++ lib/support/nginx/gitlab
@@ -17,7 +17,7 @@
## See installation.md#using-https for additional HTTPS configuration details.

View File

@ -1,4 +1,4 @@
--- lib/support/nginx/gitlab-ssl.orig 2016-06-15 01:41:18 UTC
--- lib/support/nginx/gitlab-ssl.orig 2016-07-11 19:38:44 UTC
+++ lib/support/nginx/gitlab-ssl
@@ -21,7 +21,7 @@
## See installation.md#using-https for additional HTTPS configuration details.

View File

@ -11,6 +11,6 @@ the instructions in the guide at:
https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/freebsd_patch_versions.md
If you just installed an major upgrade of GitLab, for example you
switched from 8.6.x to 8.7.x, please follow the instructions in the guide at:
switched from 8.8.x to 8.9.x, please follow the instructions in the guide at:
https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.6-to-8.7-freebsd.md
https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.8-to-8.9-freebsd.md

File diff suppressed because it is too large Load Diff