mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-30 05:40:06 +00:00
www/gitlab: Update from 8.9.6 to 8.10.12
Changes: https://github.com/gitlabhq/gitlabhq/blob/v8.10.12/CHANGELOG Approved by: junovitch (mentor, implicit)
This commit is contained in:
Torsten Zuehlsdorff
parent
5a4291d6f3
commit
28020dfaab
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=424254
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= gitlab
|
||||
PORTVERSION= 8.9.6
|
||||
PORTREVISION= 4
|
||||
PORTVERSION= 8.10.12
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= www devel
|
||||
|
||||
@ -17,17 +16,17 @@ 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>=3.0.0:devel/gitlab-shell\
|
||||
gitlab-workhorse>=0.7.5:www/gitlab-workhorse \
|
||||
gitlab-shell>=3.2.1:devel/gitlab-shell\
|
||||
gitlab-workhorse>=0.7.8:www/gitlab-workhorse \
|
||||
redis>=2.8.23:databases/redis \
|
||||
rubygem-rails4>=4.2.6:www/rubygem-rails4 \
|
||||
rubygem-rails4>=4.2.7.1:www/rubygem-rails4 \
|
||||
rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \
|
||||
rubygem-responders>=2.0:www/rubygem-responders \
|
||||
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>=4.0:devel/rubygem-devise \
|
||||
rubygem-doorkeeper>=3.1:security/rubygem-doorkeeper \
|
||||
rubygem-doorkeeper>=4.2:security/rubygem-doorkeeper \
|
||||
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 \
|
||||
@ -36,7 +35,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
|
||||
rubygem-omniauth-facebook>=3.0.0:net/rubygem-omniauth-facebook \
|
||||
rubygem-omniauth-github>=1.1.1:net/rubygem-omniauth-github \
|
||||
rubygem-omniauth-gitlab>=1.0.0:security/rubygem-omniauth-gitlab \
|
||||
rubygem-omniauth-google-oauth2>=0.2.0:net/rubygem-omniauth-google-oauth2 \
|
||||
rubygem-omniauth-google-oauth2>=0.4.1:net/rubygem-omniauth-google-oauth2 \
|
||||
rubygem-omniauth-saml>=1.6.0:security/rubygem-omniauth-saml \
|
||||
rubygem-omniauth-shibboleth>=1.2.0:security/rubygem-omniauth-shibboleth \
|
||||
rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \
|
||||
@ -50,16 +49,16 @@ RUN_DEPENDS= git>=2.7.4:devel/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_git>=10.3.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-lib>=4.2.0:www/rubygem-gollum-lib \
|
||||
rubygem-gollum-rugged_adapter>=0.4.2:www/rubygem-gollum-rugged_adapter \
|
||||
rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
|
||||
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.17.0:www/rubygem-kaminari-rails4 \
|
||||
rubygem-haml-rails-rails4>=0.9.0:www/rubygem-haml-rails-rails4 \
|
||||
rubygem-hamlit>=2.6.1:www/rubygem-hamlit \
|
||||
rubygem-carrierwave>=0.10.0:www/rubygem-carrierwave \
|
||||
rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \
|
||||
rubygem-fog-aws>=0.9:net/rubygem-fog-aws \
|
||||
@ -68,12 +67,13 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
|
||||
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-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \
|
||||
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 \
|
||||
rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
|
||||
rubygem-task_list>=1.0.2:www/rubygem-task_list \
|
||||
rubygem-github-markup>=1.3.1:textproc/rubygem-github-markup \
|
||||
rubygem-github-markup>=1.4:textproc/rubygem-github-markup \
|
||||
rubygem-redcarpet>=3.3.3:textproc/rubygem-redcarpet \
|
||||
rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
|
||||
rubygem-rdoc>=3.6:devel/rubygem-rdoc \
|
||||
@ -81,18 +81,18 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
|
||||
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.11:textproc/rubygem-rouge \
|
||||
rubygem-rouge>=2.0: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.4.0:databases/rubygem-state_machines-activerecord \
|
||||
rubygem-after_commit_queue>=0:databases/rubygem-after_commit_queue \
|
||||
rubygem-after_commit_queue>=1.3.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 \
|
||||
rubygem-sidekiq>=4.0:devel/rubygem-sidekiq \
|
||||
rubygem-sidekiq-cron>=0.4.0:devel/rubygem-sidekiq-cron \
|
||||
rubygem-redis-namespace>=0:databases/rubygem-redis-namespace \
|
||||
rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
|
||||
rubygem-httparty>=0.13.3:www/rubygem-httparty \
|
||||
rubygem-rainbow>=2.1.0:devel/rubygem-rainbow \
|
||||
rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
|
||||
@ -126,7 +126,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
|
||||
rubygem-addressable>=2.3.8:www/rubygem-addressable \
|
||||
rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \
|
||||
rubygem-font-awesome-rails-rails4>=4.6.1:devel/rubygem-font-awesome-rails-rails4 \
|
||||
rubygem-gitlab_emoji>=0.3:graphics/rubygem-gitlab_emoji \
|
||||
rubygem-gemojione>=3:graphics/rubygem-gemojione \
|
||||
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 \
|
||||
@ -136,7 +136,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
|
||||
rubygem-virtus>=1.0.1:devel/rubygem-virtus \
|
||||
rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \
|
||||
rubygem-base32>=0.3.2:converters/rubygem-base32 \
|
||||
rubygem-sentry-raven>=0.15.4:devel/rubygem-sentry-raven \
|
||||
rubygem-sentry-raven>=2.0.0:devel/rubygem-sentry-raven \
|
||||
rubygem-premailer-rails>=1.9.0:mail/rubygem-premailer-rails \
|
||||
rubygem-gitlab_meta>=7.0:devel/rubygem-gitlab_meta \
|
||||
rubygem-newrelic_rpm>=3.9.4.245:devel/rubygem-newrelic_rpm \
|
||||
@ -148,9 +148,11 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
|
||||
rubygem-activerecord-deprecated_finders>=1.0.3:devel/rubygem-activerecord-deprecated_finders \
|
||||
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-oauth2>=1.2.0:net/rubygem-oauth2 \
|
||||
rubygem-paranoia>=2.0:databases/rubygem-paranoia \
|
||||
rubygem-health_check>=1.5.1:devel/rubygem-health_check \
|
||||
rubygem-health_check>=2.1.0:devel/rubygem-health_check \
|
||||
rubygem-vmstat>=2.1.1:sysutils/rubygem-vmstat \
|
||||
rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
|
||||
rubygem-rinku>=1.7.3:www/rubygem-rinku
|
||||
|
||||
USE= pgsql=yes
|
||||
@ -183,7 +185,6 @@ do-install:
|
||||
${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample
|
||||
${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample
|
||||
${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
|
||||
|
||||
${MKDIR} ${STAGEDIR}/home/git/repositories
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1468919497
|
||||
SHA256 (gitlabhq-gitlabhq-v8.9.6_GH0.tar.gz) = 1b357ed1157a2a20b647004f588b67d72416df805a385fa7b605905bafb26f55
|
||||
SIZE (gitlabhq-gitlabhq-v8.9.6_GH0.tar.gz) = 21555571
|
||||
TIMESTAMP = 1476364451
|
||||
SHA256 (gitlabhq-gitlabhq-v8.10.12_GH0.tar.gz) = a35a4a82b63cd75ad006f1296155850b1644a8a5093678d8112289b0b7c317f3
|
||||
SIZE (gitlabhq-gitlabhq-v8.10.12_GH0.tar.gz) = 21037327
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
--- Gemfile.orig 2016-07-11 19:38:44 UTC
|
||||
--- Gemfile.orig 2016-10-11 15:15:22 UTC
|
||||
+++ Gemfile
|
||||
@@ -1,6 +1,6 @@
|
||||
source "https://rubygems.org"
|
||||
source 'https://rubygems.org'
|
||||
|
||||
-gem 'rails', '4.2.6'
|
||||
+gem 'rails', '>= 4.2.6'
|
||||
-gem 'rails', '4.2.7.1'
|
||||
+gem 'rails', '>= 4.2.7.1'
|
||||
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
||||
|
||||
# Responders respond_to and respond_with
|
||||
@ -16,23 +16,21 @@
|
||||
+gem 'sprockets', '>= 3.6.0'
|
||||
|
||||
# Default values for AR models
|
||||
-gem "default_value_for", "~> 3.0.0"
|
||||
+gem "default_value_for", ">= 3.0.0"
|
||||
-gem 'default_value_for', '~> 3.0.0'
|
||||
+gem 'default_value_for', '>= 3.0.0'
|
||||
|
||||
# Supported DBs
|
||||
-gem "mysql2", '~> 0.3.16', group: :mysql
|
||||
-gem "pg", '~> 0.18.2', group: :postgres
|
||||
+gem "pg", '>= 0.18.2', group: :postgres
|
||||
-gem 'mysql2', '~> 0.3.16', group: :mysql
|
||||
-gem 'pg', '~> 0.18.2', group: :postgres
|
||||
+gem 'pg', '>= 0.18.2', group: :postgres
|
||||
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.0'
|
||||
@@ -28,13 +27,12 @@ gem 'omniauth-cas3', '~> 1.1.2'
|
||||
gem 'omniauth-facebook', '~> 3.0.0'
|
||||
@@ -29,12 +28,11 @@ gem 'omniauth-facebook', '~> 3.0.0'
|
||||
gem 'omniauth-github', '~> 1.1.1'
|
||||
gem 'omniauth-gitlab', '~> 1.0.0'
|
||||
-gem 'omniauth-google-oauth2', '~> 0.2.0'
|
||||
gem 'omniauth-google-oauth2', '~> 0.4.1'
|
||||
-gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
||||
+gem 'omniauth-google-oauth2', '>= 0.2.0'
|
||||
gem 'omniauth-saml', '~> 1.6.0'
|
||||
gem 'omniauth-shibboleth', '~> 1.2.0'
|
||||
gem 'omniauth-twitter', '~> 1.2.0'
|
||||
@ -42,17 +40,21 @@
|
||||
gem 'jwt'
|
||||
|
||||
# Spam and anti-bot protection
|
||||
@@ -61,15 +59,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1',
|
||||
@@ -52,7 +50,7 @@ gem 'browser', '~> 2.2'
|
||||
|
||||
# Git Wiki
|
||||
# Required manually in config/initializers/gollum.rb to control load order
|
||||
-gem 'gollum-lib', '~> 4.1.0', require: false
|
||||
+gem 'gollum-lib', '>= 4.1.0', require: false
|
||||
# Extracting information from a git repository
|
||||
# Provide access to Gitlab::Git library
|
||||
-gem 'gitlab_git', '~> 10.3.2'
|
||||
+gem 'gitlab_git', '>= 10.3.2'
|
||||
|
||||
# LDAP Auth
|
||||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
@@ -65,11 +63,11 @@ gem 'gollum-lib', '~> 4.2', require: fal
|
||||
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
|
||||
|
||||
# Language detection
|
||||
-gem "github-linguist", "~> 4.7.0", require: "linguist"
|
||||
+gem "github-linguist", ">= 4.7.0", require: "linguist"
|
||||
-gem 'github-linguist', '~> 4.7.0', require: 'linguist'
|
||||
+gem 'github-linguist', '>= 4.7.0', require: 'linguist'
|
||||
|
||||
# API
|
||||
-gem 'grape', '~> 0.13.0'
|
||||
@ -62,21 +64,17 @@
|
||||
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
|
||||
|
||||
# Pagination
|
||||
@@ -79,7 +77,7 @@ gem "kaminari", "~> 0.17.0"
|
||||
gem "haml-rails", '~> 0.9.0'
|
||||
@@ -79,7 +77,7 @@ gem 'kaminari', '~> 0.17.0'
|
||||
gem 'hamlit', '~> 2.6.1'
|
||||
|
||||
# Files attachments
|
||||
-gem "carrierwave", '~> 0.10.0'
|
||||
+gem "carrierwave", '>= 0.10.0'
|
||||
-gem 'carrierwave', '~> 0.10.0'
|
||||
+gem 'carrierwave', '>= 0.10.0'
|
||||
|
||||
# Drag and Drop UI
|
||||
gem 'dropzonejs-rails', '~> 0.7.1'
|
||||
@@ -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'
|
||||
@@ -108,10 +106,10 @@ gem 'task_list', '~> 1.0.2', require
|
||||
gem 'github-markup', '~> 1.4'
|
||||
gem 'redcarpet', '~> 3.3.3'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
-gem 'rdoc', '~>3.6'
|
||||
@ -86,11 +84,9 @@
|
||||
-gem 'wikicloth', '0.8.1'
|
||||
+gem 'wikicloth', '>= 0.8.1'
|
||||
gem 'asciidoctor', '~> 1.5.2'
|
||||
-gem 'rouge', '~> 1.11'
|
||||
+gem 'rouge', '>= 1.11'
|
||||
gem 'rouge', '~> 2.0'
|
||||
|
||||
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
|
||||
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
|
||||
@@ -120,11 +118,11 @@ gem 'rouge', '~> 2.0'
|
||||
gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
|
||||
|
||||
# Diffs
|
||||
@ -99,17 +95,17 @@
|
||||
|
||||
# Application server
|
||||
group :unicorn do
|
||||
- gem "unicorn", '~> 4.9.0'
|
||||
+ gem "unicorn", '>= 4.9.0'
|
||||
- gem 'unicorn', '~> 4.9.0'
|
||||
+ gem 'unicorn', '>= 4.9.0'
|
||||
gem 'unicorn-worker-killer', '~> 0.4.2'
|
||||
end
|
||||
|
||||
@@ -174,10 +172,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.
|
||||
gem "gemnasium-gitlab-service", "~> 0.2"
|
||||
@@ -175,10 +173,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.
|
||||
gem 'gemnasium-gitlab-service', '~> 0.2'
|
||||
|
||||
# Slack integration
|
||||
-gem "slack-notifier", "~> 1.2.0"
|
||||
+gem "slack-notifier", ">= 1.2.0"
|
||||
-gem 'slack-notifier', '~> 1.2.0'
|
||||
+gem 'slack-notifier', '>= 1.2.0'
|
||||
|
||||
# Asana integration
|
||||
-gem 'asana', '~> 0.4.0'
|
||||
@ -117,33 +113,33 @@
|
||||
|
||||
# FogBugz integration
|
||||
gem 'ruby-fogbugz', '~> 0.2.1'
|
||||
@@ -189,17 +187,17 @@ gem 'd3_rails', '~> 3.5.0'
|
||||
gem "underscore-rails", "~> 1.8.0"
|
||||
@@ -190,17 +188,17 @@ gem 'd3_rails', '~> 3.5.0'
|
||||
gem 'underscore-rails', '~> 1.8.0'
|
||||
|
||||
# Sanitize user input
|
||||
-gem "sanitize", '~> 2.0'
|
||||
+gem "sanitize", '>= 2.0'
|
||||
-gem 'sanitize', '~> 2.0'
|
||||
+gem 'sanitize', '>= 2.0'
|
||||
gem 'babosa', '~> 1.0.2'
|
||||
|
||||
# Sanitizes SVG input
|
||||
gem "loofah", "~> 2.0.3"
|
||||
gem 'loofah', '~> 2.0.3'
|
||||
|
||||
# Working with license
|
||||
-gem 'licensee', '~> 8.0.0'
|
||||
+gem 'licensee', '>= 8.0.0'
|
||||
|
||||
# Protect against bruteforcing
|
||||
-gem "rack-attack", '~> 4.3.1'
|
||||
+gem "rack-attack", '>= 4.3.1'
|
||||
-gem 'rack-attack', '~> 4.3.1'
|
||||
+gem 'rack-attack', '>= 4.3.1'
|
||||
|
||||
# Ace editor
|
||||
gem 'ace-rails-ap', '~> 4.0.2'
|
||||
@@ -215,11 +213,11 @@ gem 'chronic_duration', '~> 0.10.6'
|
||||
@@ -216,11 +214,11 @@ gem 'chronic_duration', '~> 0.10.6'
|
||||
|
||||
gem "sass-rails", '~> 5.0.0'
|
||||
gem "coffee-rails", '~> 4.1.0'
|
||||
-gem "uglifier", '~> 2.7.2'
|
||||
+gem "uglifier", '>= 2.7.2'
|
||||
gem 'sass-rails', '~> 5.0.0'
|
||||
gem 'coffee-rails', '~> 4.1.0'
|
||||
-gem 'uglifier', '~> 2.7.2'
|
||||
+gem 'uglifier', '>= 2.7.2'
|
||||
gem 'turbolinks', '~> 2.5.0'
|
||||
gem 'jquery-turbolinks', '~> 2.1.0'
|
||||
|
||||
@ -151,8 +147,8 @@
|
||||
+gem 'addressable', '>= 2.3.8'
|
||||
gem 'bootstrap-sass', '~> 3.3.0'
|
||||
gem 'font-awesome-rails', '~> 4.6.1'
|
||||
gem 'gitlab_emoji', '~> 0.3.0'
|
||||
@@ -227,10 +225,10 @@ gem 'gon', '~> 6.0.1'
|
||||
gem 'gemojione', '~> 3.0'
|
||||
@@ -228,10 +226,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'
|
||||
@ -165,7 +161,7 @@
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
# Sentry integration
|
||||
@@ -238,90 +236,6 @@ gem 'sentry-raven', '~> 0.15'
|
||||
@@ -239,88 +237,6 @@ gem 'sentry-raven', '~> 2.0.0'
|
||||
|
||||
gem 'premailer-rails', '~> 1.9.0'
|
||||
|
||||
@ -177,14 +173,13 @@
|
||||
-end
|
||||
-
|
||||
-group :development do
|
||||
- gem "foreman"
|
||||
- gem 'foreman', '~> 0.78.0'
|
||||
- gem 'brakeman', '~> 3.3.0', require: false
|
||||
-
|
||||
- gem 'letter_opener_web', '~> 1.3.0'
|
||||
- gem 'quiet_assets', '~> 1.0.2'
|
||||
- gem 'rerun', '~> 0.11.0'
|
||||
- gem 'bullet', require: false
|
||||
- gem 'rblineprof', platform: :mri, require: false
|
||||
- gem 'bullet', '~> 5.0.0', require: false
|
||||
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
|
||||
- gem 'web-console', '~> 2.0'
|
||||
-
|
||||
- # Better errors handler
|
||||
@ -192,23 +187,23 @@
|
||||
- gem 'binding_of_caller', '~> 0.7.2'
|
||||
-
|
||||
- # Docs generator
|
||||
- gem "sdoc", '~> 0.3.20'
|
||||
- gem 'sdoc', '~> 0.3.20'
|
||||
-
|
||||
- # thin instead webrick
|
||||
- gem 'thin', '~> 1.6.1'
|
||||
- gem 'thin', '~> 1.7.0'
|
||||
-end
|
||||
-
|
||||
-group :development, :test do
|
||||
- gem 'byebug', platform: :mri
|
||||
- gem 'pry-rails'
|
||||
- gem 'byebug', '~> 8.2.1', platform: :mri
|
||||
- gem 'pry-rails', '~> 0.3.4'
|
||||
-
|
||||
- gem 'awesome_print', '~> 1.2.0', require: false
|
||||
- gem 'fuubar', '~> 2.0.0'
|
||||
-
|
||||
- gem 'database_cleaner', '~> 1.4.0'
|
||||
- gem 'factory_girl_rails', '~> 4.6.0'
|
||||
- gem 'rspec-rails', '~> 3.4.0'
|
||||
- gem 'rspec-retry'
|
||||
- gem 'rspec-rails', '~> 3.5.0'
|
||||
- gem 'rspec-retry', '~> 0.4.5'
|
||||
- gem 'spinach-rails', '~> 0.2.1'
|
||||
- gem 'spinach-rerun-reporter', '~> 0.0.2'
|
||||
-
|
||||
@ -230,19 +225,18 @@
|
||||
- gem 'spring-commands-spinach', '~> 1.1.0'
|
||||
- gem 'spring-commands-teaspoon', '~> 0.0.2'
|
||||
-
|
||||
- gem 'rubocop', '~> 0.40.0', require: false
|
||||
- gem 'rubocop', '~> 0.41.2', 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 'simplecov', '~> 0.11.0', require: false
|
||||
- gem 'flog', require: false
|
||||
- gem 'flay', require: false
|
||||
- gem 'bundler-audit', require: false
|
||||
- gem 'flog', '~> 4.3.2', require: false
|
||||
- gem 'flay', '~> 2.6.1', require: false
|
||||
- gem 'bundler-audit', '~> 0.5.0', require: false
|
||||
-
|
||||
- gem 'benchmark-ips', require: false
|
||||
- gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
-
|
||||
- gem "license_finder", require: false
|
||||
- gem 'knapsack'
|
||||
- gem 'license_finder', '~> 2.1.0', require: false
|
||||
- gem 'knapsack', '~> 1.11.0'
|
||||
-end
|
||||
-
|
||||
-group :test do
|
||||
@ -250,23 +244,18 @@
|
||||
- gem 'email_spec', '~> 1.6.0'
|
||||
- gem 'webmock', '~> 1.21.0'
|
||||
- gem 'test_after_commit', '~> 0.4.2'
|
||||
- gem 'sham_rack'
|
||||
- gem 'sham_rack', '~> 1.3.6'
|
||||
-end
|
||||
-
|
||||
group :production do
|
||||
gem "gitlab_meta", '7.0'
|
||||
gem 'gitlab_meta', '7.0'
|
||||
end
|
||||
@@ -339,10 +253,12 @@ gem 'activerecord-session_store', '~> 1.
|
||||
gem "nested_form", '~> 0.3.2'
|
||||
@@ -347,5 +263,7 @@ gem 'paranoia', '~> 2.0'
|
||||
gem 'health_check', '~> 2.1.0'
|
||||
|
||||
# OAuth
|
||||
-gem 'oauth2', '~> 1.0.0'
|
||||
+gem 'oauth2', '>= 1.0.0'
|
||||
|
||||
# Soft deletion
|
||||
gem "paranoia", "~> 2.0"
|
||||
|
||||
+gem "rinku"
|
||||
# System information
|
||||
-gem 'vmstat', '~> 2.1.1'
|
||||
+gem 'vmstat', '>= 2.1.1'
|
||||
gem 'sys-filesystem', '~> 1.1.6'
|
||||
+
|
||||
# Health check
|
||||
gem 'health_check', '~> 1.5.1'
|
||||
+gem 'rinku'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
--- config/database.yml.postgresql.orig 2016-07-11 19:38:44 UTC
|
||||
--- config/database.yml.postgresql.orig 2016-10-11 15:15:22 UTC
|
||||
+++ config/database.yml.postgresql
|
||||
@@ -6,7 +6,7 @@ production:
|
||||
encoding: unicode
|
||||
|
||||
@ -1,21 +1,31 @@
|
||||
--- config/gitlab.yml.example.orig 2016-07-11 19:38:44 UTC
|
||||
--- config/gitlab.yml.example.orig 2016-10-11 15:15:22 UTC
|
||||
+++ config/gitlab.yml.example
|
||||
@@ -451,11 +451,11 @@ production: &base
|
||||
@@ -433,7 +433,7 @@ production: &base
|
||||
# Paths where repositories can be stored. Give the canonicalized absolute pathname.
|
||||
# NOTE: REPOS PATHS MUST NOT CONTAIN ANY SYMLINK!!!
|
||||
storages: # You must have at least a `default` storage path.
|
||||
- default: /home/git/repositories/
|
||||
+ default: /usr/home/git/repositories/
|
||||
|
||||
## Backup settings
|
||||
backup:
|
||||
@@ -458,12 +458,12 @@ production: &base
|
||||
|
||||
## GitLab Shell settings
|
||||
gitlab_shell:
|
||||
- path: /home/git/gitlab-shell/
|
||||
+ path: /usr/local/share/gitlab-shell/
|
||||
|
||||
# REPOS_PATH MUST NOT BE A SYMLINK!!!
|
||||
- repos_path: /home/git/repositories/
|
||||
- hooks_path: /home/git/gitlab-shell/hooks/
|
||||
+ repos_path: /usr/home/git/repositories/
|
||||
+ path: /usr/local/share/gitlab-shell/
|
||||
+ hooks_path: /usr/local/share/gitlab-shell/hooks/
|
||||
|
||||
# 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).
|
||||
@@ -472,7 +472,7 @@ production: &base
|
||||
- # secret_file: /home/git/gitlab/.gitlab_shell_secret
|
||||
+ # secret_file: /usr/home/git/gitlab/.gitlab_shell_secret
|
||||
|
||||
# Git over HTTP
|
||||
upload_pack: true
|
||||
@@ -476,7 +476,7 @@ production: &base
|
||||
# CAUTION!
|
||||
# Use the default values unless you really know what you are doing
|
||||
git:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- config/initializers/1_settings.rb.orig 2016-07-11 19:38:44 UTC
|
||||
--- config/initializers/1_settings.rb.orig 2016-10-11 15:15:22 UTC
|
||||
+++ config/initializers/1_settings.rb
|
||||
@@ -191,12 +191,8 @@ Settings.gitlab['email_reply_to'] ||= EN
|
||||
@@ -189,12 +189,8 @@ Settings.gitlab['email_reply_to'] ||= EN
|
||||
Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url)
|
||||
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
|
||||
Settings.gitlab['user'] ||= 'git'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
--- config/unicorn.rb.example.orig 2016-07-11 19:38:44 UTC
|
||||
--- config/unicorn.rb.example.orig 2016-10-11 15:15:22 UTC
|
||||
+++ config/unicorn.rb.example
|
||||
@@ -33,12 +33,12 @@ worker_processes 3
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
--- lib/support/nginx/gitlab.orig 2016-07-11 19:38:44 UTC
|
||||
--- lib/support/nginx/gitlab.orig 2016-10-11 15:15:22 UTC
|
||||
+++ lib/support/nginx/gitlab
|
||||
@@ -17,7 +17,7 @@
|
||||
## See installation.md#using-https for additional HTTPS configuration details.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
--- lib/support/nginx/gitlab-ssl.orig 2016-07-11 19:38:44 UTC
|
||||
--- lib/support/nginx/gitlab-ssl.orig 2016-10-11 15:15:22 UTC
|
||||
+++ lib/support/nginx/gitlab-ssl
|
||||
@@ -21,7 +21,7 @@
|
||||
## See installation.md#using-https for additional HTTPS configuration details.
|
||||
|
||||
@ -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.8.x to 8.9.x, please follow the instructions in the guide at:
|
||||
switched from 8.9.x to 8.10.x, please follow the instructions in the guide at:
|
||||
|
||||
https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.8-to-8.9-freebsd.md
|
||||
https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.9-to-8.10-freebsd.md
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user