svn commit: r435753 - in head/www/gitlab: . files
Torsten Zuehlsdorff
tz at FreeBSD.org
Thu Mar 9 09:47:13 UTC 2017
Author: tz
Date: Thu Mar 9 09:47:11 2017
New Revision: 435753
URL: https://svnweb.freebsd.org/changeset/ports/435753
Log:
www/gitlab: Update from 8.12.13 to 8.13.12
Changelog: https://github.com/gitlabhq/gitlabhq/blob/v8.13.12/CHANGELOG.md
Modified:
head/www/gitlab/Makefile
head/www/gitlab/distinfo
head/www/gitlab/files/patch-Gemfile
head/www/gitlab/files/patch-config_database.yml.postgresql
head/www/gitlab/files/patch-config_gitlab.yml.example
head/www/gitlab/files/patch-config_initializers_1__settings.rb
head/www/gitlab/files/patch-config_unicorn.rb.example
head/www/gitlab/files/patch-lib_support_nginx_gitlab
head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
head/www/gitlab/pkg-message
head/www/gitlab/pkg-plist
Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/Makefile Thu Mar 9 09:47:11 2017 (r435753)
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= gitlab
-PORTVERSION= 8.12.13
+PORTVERSION= 8.13.12
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= www devel
MAINTAINER= tz at FreeBSD.org
@@ -18,19 +17,19 @@ 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.6.1:devel/gitlab-shell\
- gitlab-workhorse>=0.8.2:www/gitlab-workhorse \
+ gitlab-shell>=3.6.6:devel/gitlab-shell\
+ gitlab-workhorse>=0.8.5:www/gitlab-workhorse \
redis>=2.8.23:databases/redis \
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-sprockets-es6>=0:devel/rubygem-sprockets-es6 \
+ rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \
+ rubygem-sprockets-es6>=0.9.2:devel/rubygem-sprockets-es6 \
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-devise>=4.2:devel/rubygem-devise \
rubygem-doorkeeper>=4.2:security/rubygem-doorkeeper \
- rubygem-omniauth>=1.3.1:security/rubygem-omniauth \
+ rubygem-omniauth>=1.3.2: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 \
rubygem-omniauth-bitbucket>=0.0.2:security/rubygem-omniauth-bitbucket \
@@ -39,7 +38,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
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.4.1:net/rubygem-omniauth-google-oauth2 \
- rubygem-omniauth-saml>=1.6.0:security/rubygem-omniauth-saml \
+ rubygem-omniauth-saml>=1.7.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 \
rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \
@@ -52,7 +51,7 @@ 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.6.6:devel/rubygem-gitlab_git \
+ rubygem-gitlab_git>=10.7.0:devel/rubygem-gitlab_git \
rubygem-gitlab_omniauth-ldap>=1.2.1:net/rubygem-gitlab_omniauth-ldap \
rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \
rubygem-gollum-rugged_adapter>=0.4.2:www/rubygem-gollum-rugged_adapter \
@@ -74,8 +73,8 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-unf>=0.1.4:textproc/rubygem-unf \
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-gitlab-markup>=1.5.0:textproc/rubygem-gitlab-markup \
+ rubygem-deckar01-task_list>=1.0.5:www/rubygem-deckar01-task_list \
+ rubygem-gitlab-markup>=1.5.1:textproc/rubygem-gitlab-markup \
rubygem-redcarpet>=3.3.3:textproc/rubygem-redcarpet \
rubygem-redcloth>=4.3.2:www/rubygem-redcloth \
rubygem-rdoc>=3.6:devel/rubygem-rdoc \
@@ -84,15 +83,15 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-wikicloth>=0.8.1:textproc/rubygem-wikicloth \
rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \
rubygem-rouge>=2.0:textproc/rubygem-rouge \
+ rubygem-truncato>=0.7.8:textproc/rubygem-truncato \
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-unicorn>=5.1.0:www/rubygem-unicorn \
+ rubygem-unicorn-worker-killer>=0.4.4:www/rubygem-unicorn-worker-killer \
rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \
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-acts-as-taggable-on>=4.0.0:www/rubygem-acts-as-taggable-on \
+ rubygem-sidekiq>=4.2:devel/rubygem-sidekiq \
rubygem-sidekiq-cron>=0.4.0:devel/rubygem-sidekiq-cron \
rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
rubygem-httparty>=0.13.3:www/rubygem-httparty \
@@ -121,11 +120,10 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-oj>=2.17.4:devel/rubygem-oj \
rubygem-chronic>=0.10.2:devel/rubygem-chronic \
rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
- rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \
+ rubygem-sass-rails5>=5.0.6:textproc/rubygem-sass-rails5 \
rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \
rubygem-uglifier>=2.7.2:www/rubygem-uglifier \
- rubygem-turbolinks-classic>=2.5.0:www/rubygem-turbolinks-classic \
- rubygem-jquery-turbolinks>=2.1.0:www/rubygem-jquery-turbolinks \
+ rubygem-gitlab-turbolinks-classic>=2.5.6:www/rubygem-gitlab-turbolinks-classic \
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 \
@@ -134,26 +132,25 @@ RUN_DEPENDS= git>=2.7.4:devel/git \
rubygem-jquery-atwho-rails>=1.3.2:www/rubygem-jquery-atwho-rails \
rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \
rubygem-jquery-ui-rails5-rails4>=5.0.0:www/rubygem-jquery-ui-rails5-rails4 \
- rubygem-request_store>=1.3.0:devel/rubygem-request_store \
+ rubygem-request_store>=1.3:devel/rubygem-request_store \
rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \
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>=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-grape>=0:devel/rubygem-newrelic-grape \
rubygem-newrelic_rpm>=3.16:devel/rubygem-newrelic_rpm \
rubygem-octokit>=4.3.0:net/rubygem-octokit \
rubygem-mail_room>=0.8.1:mail/rubygem-mail_room \
rubygem-email_reply_parser>=0.5.8:mail/rubygem-email_reply_parser \
- rubygem-ruby-prof>=0.15.9:devel/rubygem-ruby-prof \
+ rubygem-ruby-prof>=0.16.2:devel/rubygem-ruby-prof \
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.2.0:net/rubygem-oauth2 \
rubygem-paranoia>=2.0:databases/rubygem-paranoia \
- rubygem-health_check>=2.1.0:devel/rubygem-health_check \
+ rubygem-health_check>=2.2.0:devel/rubygem-health_check \
rubygem-vmstat>=2.2:sysutils/rubygem-vmstat \
rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
rubygem-rinku>=1.7.3:www/rubygem-rinku
Modified: head/www/gitlab/distinfo
==============================================================================
--- head/www/gitlab/distinfo Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/distinfo Thu Mar 9 09:47:11 2017 (r435753)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485945896
-SHA256 (gitlabhq-gitlabhq-v8.12.13_GH0.tar.gz) = 7495bce297e95e880e3f2881d92e8d5b84cacd84b60eb54de459844176ec6f4a
-SIZE (gitlabhq-gitlabhq-v8.12.13_GH0.tar.gz) = 27115017
+TIMESTAMP = 1488376696
+SHA256 (gitlabhq-gitlabhq-v8.13.12_GH0.tar.gz) = 9a01b44ada5e0264759e1e7f9b71c22cbe1bd15ba66d8fea8ce65aac8408c205
+SIZE (gitlabhq-gitlabhq-v8.13.12_GH0.tar.gz) = 27817292
Modified: head/www/gitlab/files/patch-Gemfile
==============================================================================
--- head/www/gitlab/files/patch-Gemfile Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/files/patch-Gemfile Thu Mar 9 09:47:11 2017 (r435753)
@@ -1,6 +1,6 @@
---- Gemfile.orig 2016-12-14 20:07:13 UTC
+--- Gemfile.orig 2017-01-21 16:35:45 UTC
+++ Gemfile
-@@ -1,6 +1,6 @@
+@@ -1,20 +1,19 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.7.1'
@@ -8,13 +8,11 @@
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
-@@ -8,15 +8,14 @@ gem 'responders', '~> 2.0'
+ gem 'responders', '~> 2.0'
- # Specify a sprockets version due to increased performance
- # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
--gem 'sprockets', '~> 3.6.0'
-+gem 'sprockets', '>= 3.6.0'
- gem 'sprockets-es6'
+-gem 'sprockets', '~> 3.7.0'
++gem 'sprockets', '>= 3.7.0'
+ gem 'sprockets-es6', '~> 0.9.2'
# Default values for AR models
-gem 'default_value_for', '~> 3.0.0'
@@ -26,14 +24,13 @@
+gem 'pg', '>= 0.18.2', group: :postgres
# Authentication libraries
- gem 'devise', '~> 4.0'
-@@ -30,16 +29,15 @@ gem 'omniauth-facebook', '~> 4.0.0'
+ gem 'devise', '~> 4.2'
+@@ -28,16 +27,15 @@ gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.0'
gem 'omniauth-google-oauth2', '~> 0.4.1'
-gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
--gem 'omniauth-saml', '~> 1.6.0'
-+gem 'omniauth-saml', '>= 1.6.0'
+ gem 'omniauth-saml', '~> 1.7.0'
gem 'omniauth-shibboleth', '~> 1.2.0'
-gem 'omniauth-twitter', '~> 1.2.0'
+gem 'omniauth-twitter', '>= 1.2.0'
@@ -48,16 +45,7 @@
gem 'akismet', '~> 2.0'
# Two-factor authentication
-@@ -53,7 +51,7 @@ gem 'browser', '~> 2.2'
-
- # Extracting information from a git repository
- # Provide access to Gitlab::Git library
--gem 'gitlab_git', '~> 10.6.6'
-+gem 'gitlab_git', '>= 10.6.6'
-
- # LDAP Auth
- # GitLab fork with several improvements to original library. For full list of changes
-@@ -66,10 +64,10 @@ gem 'gollum-lib', '~> 4.2', require: fal
+@@ -64,10 +62,10 @@ gem 'gollum-lib', '~> 4.2', require: fal
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
# Language detection
@@ -70,7 +58,7 @@
gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
-@@ -77,10 +75,10 @@ gem 'rack-cors', '~> 0.4.0', require:
+@@ -75,10 +73,10 @@ gem 'rack-cors', '~> 0.4.0', require:
gem 'kaminari', '~> 0.17.0'
# HAML
@@ -83,21 +71,25 @@
# Drag and Drop UI
gem 'dropzonejs-rails', '~> 0.7.1'
-@@ -104,25 +102,25 @@ gem 'seed-fu', '~> 2.3.5'
- gem 'html-pipeline', '~> 1.11.0'
- gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
- gem 'gitlab-markup', '~> 1.5.0'
--gem 'redcarpet', '~> 3.3.3'
-+gem 'redcarpet', '>= 3.3.3'
- gem 'RedCloth', '~> 4.3.2'
--gem 'rdoc', '~>3.6'
-+gem 'rdoc', '>= 3.6'
- gem 'org-ruby', '~> 0.9.12'
- gem 'creole', '~> 0.5.0'
--gem 'wikicloth', '0.8.1'
-+gem 'wikicloth', '>= 0.8.1'
- gem 'asciidoctor', '~> 1.5.2'
- gem 'rouge', '~> 2.0'
+@@ -100,28 +98,28 @@ gem 'seed-fu', '~> 2.3.5'
+
+ # Markdown and HTML processing
+ gem 'html-pipeline', '~> 1.11.0'
+-gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
++gem 'deckar01-task_list', '>= 1.0.5', require: 'task_list/railtie'
+ gem 'gitlab-markup', '~> 1.5.1'
+-gem 'redcarpet', '~> 3.3.3'
++gem 'redcarpet', '>= 3.3.3'
+ gem 'RedCloth', '~> 4.3.2'
+-gem 'rdoc', '~>3.6'
++gem 'rdoc', '>= 3.6'
+ gem 'org-ruby', '~> 0.9.12'
+ gem 'creole', '~> 0.5.0'
+-gem 'wikicloth', '0.8.1'
++gem 'wikicloth', '>= 0.8.1'
+ gem 'asciidoctor', '~> 1.5.2'
+ gem 'rouge', '~> 2.0'
+ gem 'truncato', '~> 0.7.8'
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@@ -110,12 +102,12 @@
# Application server
group :unicorn do
-- gem 'unicorn', '~> 4.9.0'
-+ gem 'unicorn', '>= 4.9.0'
- gem 'unicorn-worker-killer', '~> 0.4.2'
+- gem 'unicorn', '~> 5.1.0'
++ gem 'unicorn', '>= 5.1.0'
+ gem 'unicorn-worker-killer', '~> 0.4.4'
end
-@@ -141,7 +139,7 @@ gem 'sidekiq-cron', '~> 0.4.0'
+@@ -139,7 +137,7 @@ gem 'sidekiq-cron', '~> 0.4.0'
gem 'redis-namespace', '~> 1.5.2'
# HTTP requests
@@ -124,7 +116,7 @@
# Colored output to console
gem 'rainbow', '~> 2.1.0'
-@@ -170,10 +168,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.
+@@ -168,10 +166,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.
gem 'gemnasium-gitlab-service', '~> 0.2'
# Slack integration
@@ -137,7 +129,7 @@
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
-@@ -185,17 +183,17 @@ gem 'd3_rails', '~> 3.5.0'
+@@ -183,17 +181,17 @@ gem 'd3_rails', '~> 3.5.0'
gem 'underscore-rails', '~> 1.8.0'
# Sanitize user input
@@ -158,14 +150,13 @@
# Ace editor
gem 'ace-rails-ap', '~> 4.1.0'
-@@ -215,127 +213,42 @@ gem 'chronic_duration', '~> 0.10.6'
+@@ -213,117 +211,31 @@ gem 'chronic_duration', '~> 0.10.6'
- gem 'sass-rails', '~> 5.0.0'
+ gem 'sass-rails', '~> 5.0.6'
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'
+ gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
-gem 'addressable', '~> 2.3.8'
+gem 'addressable', '>= 2.3.8'
@@ -178,8 +169,8 @@
-gem 'jquery-rails', '~> 4.1.0'
+gem 'jquery-rails', '>= 4.1.0'
gem 'jquery-ui-rails', '~> 5.0.0'
--gem 'request_store', '~> 1.3.0'
-+gem 'request_store', '>= 1.3.0'
+-gem 'request_store', '~> 1.3'
++gem 'request_store', '>= 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
-gem 'net-ssh', '~> 3.0.1'
@@ -252,12 +243,11 @@
- gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'spring-commands-teaspoon', '~> 0.0.2'
-
-- gem 'rubocop', '~> 0.42.0', require: false
+- gem 'rubocop', '~> 0.43.0', require: false
- gem 'rubocop-rspec', '~> 1.5.0', require: false
- gem 'scss_lint', '~> 0.47.0', require: false
- gem 'haml_lint', '~> 0.18.2', require: false
- gem 'simplecov', '0.12.0', require: false
-- gem 'flog', '~> 4.3.2', require: false
- gem 'flay', '~> 2.6.1', require: false
- gem 'bundler-audit', '~> 0.5.0', require: false
-
@@ -265,6 +255,8 @@
-
- gem 'license_finder', '~> 2.1.0', require: false
- gem 'knapsack', '~> 1.11.0'
+-
+- gem 'activerecord_sane_schema_dumper', '0.2'
-end
-
-group :test do
@@ -277,10 +269,6 @@
- gem 'timecop', '~> 0.8.0'
-end
-
- group :production do
- gem 'gitlab_meta', '7.0'
- end
-
gem 'newrelic_rpm', '~> 3.16'
-gem 'octokit', '~> 4.3.0'
@@ -288,23 +276,15 @@
gem 'mail_room', '~> 0.8.1'
- gem 'email_reply_parser', '~> 0.5.8'
-
--gem 'ruby-prof', '~> 0.15.9'
-+gem 'ruby-prof', '>= 0.15.9'
-
- ## CI
- gem 'activerecord-session_store', '~> 1.0.0'
-@@ -348,8 +261,10 @@ gem 'oauth2', '~> 1.2.0'
+@@ -342,8 +254,10 @@ gem 'oauth2', '~> 1.2.0'
gem 'paranoia', '~> 2.0'
# Health check
--gem 'health_check', '~> 2.1.0'
-+gem 'health_check', '>= 2.1.0'
+-gem 'health_check', '~> 2.2.0'
++gem 'health_check', '>= 2.2.0'
# System information
--gem 'vmstat', '~> 2.2'
-+gem 'vmstat', '>= 2.1.1'
+ gem 'vmstat', '~> 2.2'
gem 'sys-filesystem', '~> 1.1.6'
+
+gem 'rinku'
Modified: head/www/gitlab/files/patch-config_database.yml.postgresql
==============================================================================
--- head/www/gitlab/files/patch-config_database.yml.postgresql Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/files/patch-config_database.yml.postgresql Thu Mar 9 09:47:11 2017 (r435753)
@@ -1,4 +1,4 @@
---- config/database.yml.postgresql.orig 2016-12-14 20:07:13 UTC
+--- config/database.yml.postgresql.orig 2017-01-21 16:35:45 UTC
+++ config/database.yml.postgresql
@@ -6,7 +6,7 @@ production:
encoding: unicode
Modified: head/www/gitlab/files/patch-config_gitlab.yml.example
==============================================================================
--- head/www/gitlab/files/patch-config_gitlab.yml.example Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/files/patch-config_gitlab.yml.example Thu Mar 9 09:47:11 2017 (r435753)
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig 2016-12-14 20:07:13 UTC
+--- config/gitlab.yml.example.orig 2017-01-21 16:35:45 UTC
+++ config/gitlab.yml.example
-@@ -433,7 +433,7 @@ production: &base
+@@ -434,7 +434,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.
@@ -9,7 +9,7 @@
## Backup settings
backup:
-@@ -458,12 +458,12 @@ production: &base
+@@ -459,12 +459,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -25,7 +25,7 @@
# Git over HTTP
upload_pack: true
-@@ -476,7 +476,7 @@ production: &base
+@@ -477,7 +477,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:
Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb
==============================================================================
--- head/www/gitlab/files/patch-config_initializers_1__settings.rb Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/files/patch-config_initializers_1__settings.rb Thu Mar 9 09:47:11 2017 (r435753)
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig 2016-12-14 20:07:13 UTC
+--- config/initializers/1_settings.rb.orig 2017-01-21 16:35:45 UTC
+++ config/initializers/1_settings.rb
-@@ -189,12 +189,8 @@ Settings.gitlab['email_reply_to'] ||= EN
+@@ -190,12 +190,8 @@ Settings.gitlab['email_subject_suffix']
Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'
Modified: head/www/gitlab/files/patch-config_unicorn.rb.example
==============================================================================
--- head/www/gitlab/files/patch-config_unicorn.rb.example Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/files/patch-config_unicorn.rb.example Thu Mar 9 09:47:11 2017 (r435753)
@@ -1,4 +1,4 @@
---- config/unicorn.rb.example.orig 2016-12-14 20:07:13 UTC
+--- config/unicorn.rb.example.orig 2017-01-21 16:35:45 UTC
+++ config/unicorn.rb.example
@@ -33,12 +33,12 @@ worker_processes 3
Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab
==============================================================================
--- head/www/gitlab/files/patch-lib_support_nginx_gitlab Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/files/patch-lib_support_nginx_gitlab Thu Mar 9 09:47:11 2017 (r435753)
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab.orig 2016-12-14 20:07:13 UTC
+--- lib/support/nginx/gitlab.orig 2017-01-21 16:35:45 UTC
+++ lib/support/nginx/gitlab
@@ -17,7 +17,7 @@
## See installation.md#using-https for additional HTTPS configuration details.
Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
==============================================================================
--- head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Thu Mar 9 09:47:11 2017 (r435753)
@@ -1,4 +1,4 @@
---- lib/support/nginx/gitlab-ssl.orig 2016-12-14 20:07:13 UTC
+--- lib/support/nginx/gitlab-ssl.orig 2017-01-21 16:35:45 UTC
+++ lib/support/nginx/gitlab-ssl
@@ -21,7 +21,7 @@
## See installation.md#using-https for additional HTTPS configuration details.
Modified: head/www/gitlab/pkg-message
==============================================================================
--- head/www/gitlab/pkg-message Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/pkg-message Thu Mar 9 09:47:11 2017 (r435753)
@@ -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.11.x to 8.12.x, please follow the instructions in the guide at:
+switched from 8.12.x to 8.13.x, please follow the instructions in the guide at:
-https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.11-to-8.12-freebsd.md
+https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.12-to-8.13-freebsd.md
Modified: head/www/gitlab/pkg-plist
==============================================================================
--- head/www/gitlab/pkg-plist Thu Mar 9 09:46:37 2017 (r435752)
+++ head/www/gitlab/pkg-plist Thu Mar 9 09:47:11 2017 (r435753)
@@ -16,8 +16,7 @@
%%WWWDIR%%/.rubocop_todo.yml
%%WWWDIR%%/.ruby-version
%%WWWDIR%%/.scss-lint.yml
-%%WWWDIR%%/.vagrant_enabled
-%%WWWDIR%%/CHANGELOG
+%%WWWDIR%%/CHANGELOG.md
%%WWWDIR%%/CONTRIBUTING.md
%%WWWDIR%%/GITLAB_SHELL_VERSION
%%WWWDIR%%/GITLAB_WORKHORSE_VERSION
@@ -72,6 +71,13 @@
%%WWWDIR%%/app/assets/images/koding-logo.svg
%%WWWDIR%%/app/assets/images/logo.svg
%%WWWDIR%%/app/assets/images/logo_wordmark.svg
+%%WWWDIR%%/app/assets/images/mailers/ci_pipeline_notif_v1/gitlab-logo-full-horizontal.gif
+%%WWWDIR%%/app/assets/images/mailers/ci_pipeline_notif_v1/gitlab-logo.gif
+%%WWWDIR%%/app/assets/images/mailers/ci_pipeline_notif_v1/icon-branch-gray.gif
+%%WWWDIR%%/app/assets/images/mailers/ci_pipeline_notif_v1/icon-check-green-inverted.gif
+%%WWWDIR%%/app/assets/images/mailers/ci_pipeline_notif_v1/icon-commit-gray.gif
+%%WWWDIR%%/app/assets/images/mailers/ci_pipeline_notif_v1/icon-x-red-inverted.gif
+%%WWWDIR%%/app/assets/images/mailers/ci_pipeline_notif_v1/icon-x-red.gif
%%WWWDIR%%/app/assets/images/mailers/gitlab_header_logo.png
%%WWWDIR%%/app/assets/images/mailers/gitlab_tanuki_2x.png
%%WWWDIR%%/app/assets/images/monokai-scheme-preview.png
@@ -87,7 +93,6 @@
%%WWWDIR%%/app/assets/images/touch-icon-iphone-retina.png
%%WWWDIR%%/app/assets/images/touch-icon-iphone.png
%%WWWDIR%%/app/assets/images/white-scheme-preview.png
-%%WWWDIR%%/app/assets/javascripts/LabelManager.js
%%WWWDIR%%/app/assets/javascripts/abuse_reports.js.es6
%%WWWDIR%%/app/assets/javascripts/activities.js
%%WWWDIR%%/app/assets/javascripts/admin.js
@@ -101,13 +106,13 @@
%%WWWDIR%%/app/assets/javascripts/behaviors/quick_submit.js
%%WWWDIR%%/app/assets/javascripts/behaviors/requires_input.js
%%WWWDIR%%/app/assets/javascripts/behaviors/toggler_behavior.js
-%%WWWDIR%%/app/assets/javascripts/blob/blob_ci_yaml.js
+%%WWWDIR%%/app/assets/javascripts/blob/blob_ci_yaml.js.es6
%%WWWDIR%%/app/assets/javascripts/blob/blob_file_dropzone.js
%%WWWDIR%%/app/assets/javascripts/blob/blob_gitignore_selector.js
%%WWWDIR%%/app/assets/javascripts/blob/blob_gitignore_selectors.js
%%WWWDIR%%/app/assets/javascripts/blob/blob_license_selector.js
-%%WWWDIR%%/app/assets/javascripts/blob/blob_license_selectors.js
-%%WWWDIR%%/app/assets/javascripts/blob/template_selector.js
+%%WWWDIR%%/app/assets/javascripts/blob/blob_license_selectors.js.es6
+%%WWWDIR%%/app/assets/javascripts/blob/template_selector.js.es6
%%WWWDIR%%/app/assets/javascripts/blob_edit/blob_edit_bundle.js
%%WWWDIR%%/app/assets/javascripts/blob_edit/edit_blob.js
%%WWWDIR%%/app/assets/javascripts/boards/boards_bundle.js.es6
@@ -116,6 +121,7 @@
%%WWWDIR%%/app/assets/javascripts/boards/components/board_card.js.es6
%%WWWDIR%%/app/assets/javascripts/boards/components/board_delete.js.es6
%%WWWDIR%%/app/assets/javascripts/boards/components/board_list.js.es6
+%%WWWDIR%%/app/assets/javascripts/boards/components/board_new_issue.js.es6
%%WWWDIR%%/app/assets/javascripts/boards/components/new_list_dropdown.js.es6
%%WWWDIR%%/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
%%WWWDIR%%/app/assets/javascripts/boards/models/issue.js.es6
@@ -133,14 +139,14 @@
%%WWWDIR%%/app/assets/javascripts/build_variables.js.es6
%%WWWDIR%%/app/assets/javascripts/commit.js
%%WWWDIR%%/app/assets/javascripts/commit/file.js
-%%WWWDIR%%/app/assets/javascripts/commit/image-file.js
+%%WWWDIR%%/app/assets/javascripts/commit/image_file.js
%%WWWDIR%%/app/assets/javascripts/commits.js
%%WWWDIR%%/app/assets/javascripts/compare.js
%%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js.es6
%%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js
%%WWWDIR%%/app/assets/javascripts/copy_to_clipboard.js
%%WWWDIR%%/app/assets/javascripts/create_label.js.es6
-%%WWWDIR%%/app/assets/javascripts/cycle-analytics.js.es6
+%%WWWDIR%%/app/assets/javascripts/cycle_analytics.js.es6
%%WWWDIR%%/app/assets/javascripts/diff.js
%%WWWDIR%%/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
%%WWWDIR%%/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
@@ -153,7 +159,7 @@
%%WWWDIR%%/app/assets/javascripts/diff_notes/models/note.js.es6
%%WWWDIR%%/app/assets/javascripts/diff_notes/services/resolve.js.es6
%%WWWDIR%%/app/assets/javascripts/diff_notes/stores/comments.js.es6
-%%WWWDIR%%/app/assets/javascripts/dispatcher.js
+%%WWWDIR%%/app/assets/javascripts/dispatcher.js.es6
%%WWWDIR%%/app/assets/javascripts/dropzone_input.js
%%WWWDIR%%/app/assets/javascripts/due_date_select.js.es6
%%WWWDIR%%/app/assets/javascripts/extensions/array.js
@@ -162,6 +168,7 @@
%%WWWDIR%%/app/assets/javascripts/flash.js
%%WWWDIR%%/app/assets/javascripts/gfm_auto_complete.js.es6
%%WWWDIR%%/app/assets/javascripts/gl_dropdown.js
+%%WWWDIR%%/app/assets/javascripts/gl_field_errors.js.es6
%%WWWDIR%%/app/assets/javascripts/gl_form.js
%%WWWDIR%%/app/assets/javascripts/graphs/graphs_bundle.js
%%WWWDIR%%/app/assets/javascripts/graphs/stat_graph.js
@@ -169,7 +176,6 @@
%%WWWDIR%%/app/assets/javascripts/graphs/stat_graph_contributors_graph.js
%%WWWDIR%%/app/assets/javascripts/graphs/stat_graph_contributors_util.js
%%WWWDIR%%/app/assets/javascripts/group_avatar.js
-%%WWWDIR%%/app/assets/javascripts/groups.js
%%WWWDIR%%/app/assets/javascripts/groups_select.js
%%WWWDIR%%/app/assets/javascripts/importer_status.js
%%WWWDIR%%/app/assets/javascripts/issuable.js.es6
@@ -177,7 +183,8 @@
%%WWWDIR%%/app/assets/javascripts/issuable_form.js
%%WWWDIR%%/app/assets/javascripts/issue.js
%%WWWDIR%%/app/assets/javascripts/issue_status_select.js
-%%WWWDIR%%/app/assets/javascripts/issues-bulk-assignment.js
+%%WWWDIR%%/app/assets/javascripts/issues_bulk_assignment.js.es6
+%%WWWDIR%%/app/assets/javascripts/label_manager.js.es6
%%WWWDIR%%/app/assets/javascripts/labels.js
%%WWWDIR%%/app/assets/javascripts/labels_select.js
%%WWWDIR%%/app/assets/javascripts/layout_nav.js
@@ -198,16 +205,24 @@
%%WWWDIR%%/app/assets/javascripts/line_highlighter.js
%%WWWDIR%%/app/assets/javascripts/logo.js
%%WWWDIR%%/app/assets/javascripts/member_expiration_date.js
-%%WWWDIR%%/app/assets/javascripts/merge_conflict_data_provider.js.es6
-%%WWWDIR%%/app/assets/javascripts/merge_conflict_resolver.js.es6
+%%WWWDIR%%/app/assets/javascripts/members.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js.es6
+%%WWWDIR%%/app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js.es6
%%WWWDIR%%/app/assets/javascripts/merge_request.js
%%WWWDIR%%/app/assets/javascripts/merge_request_tabs.js
-%%WWWDIR%%/app/assets/javascripts/merge_request_widget.js
+%%WWWDIR%%/app/assets/javascripts/merge_request_widget.js.es6
%%WWWDIR%%/app/assets/javascripts/merged_buttons.js
%%WWWDIR%%/app/assets/javascripts/milestone.js
%%WWWDIR%%/app/assets/javascripts/milestone_select.js
%%WWWDIR%%/app/assets/javascripts/namespace_select.js
-%%WWWDIR%%/app/assets/javascripts/network/branch-graph.js
+%%WWWDIR%%/app/assets/javascripts/network/branch_graph.js
%%WWWDIR%%/app/assets/javascripts/network/network.js
%%WWWDIR%%/app/assets/javascripts/network/network_bundle.js
%%WWWDIR%%/app/assets/javascripts/new_branch_form.js
@@ -216,29 +231,29 @@
%%WWWDIR%%/app/assets/javascripts/notifications_dropdown.js
%%WWWDIR%%/app/assets/javascripts/notifications_form.js
%%WWWDIR%%/app/assets/javascripts/pager.js
-%%WWWDIR%%/app/assets/javascripts/pipeline.js.es6
+%%WWWDIR%%/app/assets/javascripts/pipelines.js.es6
%%WWWDIR%%/app/assets/javascripts/preview_markdown.js
-%%WWWDIR%%/app/assets/javascripts/profile/gl_crop.js
-%%WWWDIR%%/app/assets/javascripts/profile/profile.js
+%%WWWDIR%%/app/assets/javascripts/profile/gl_crop.js.es6
+%%WWWDIR%%/app/assets/javascripts/profile/profile.js.es6
%%WWWDIR%%/app/assets/javascripts/profile/profile_bundle.js
%%WWWDIR%%/app/assets/javascripts/project.js
%%WWWDIR%%/app/assets/javascripts/project_avatar.js
%%WWWDIR%%/app/assets/javascripts/project_find_file.js
%%WWWDIR%%/app/assets/javascripts/project_fork.js
%%WWWDIR%%/app/assets/javascripts/project_import.js
-%%WWWDIR%%/app/assets/javascripts/project_members.js
%%WWWDIR%%/app/assets/javascripts/project_new.js
%%WWWDIR%%/app/assets/javascripts/project_select.js
%%WWWDIR%%/app/assets/javascripts/project_show.js
%%WWWDIR%%/app/assets/javascripts/projects_list.js
-%%WWWDIR%%/app/assets/javascripts/protected_branch_access_dropdown.js.es6
-%%WWWDIR%%/app/assets/javascripts/protected_branch_create.js.es6
-%%WWWDIR%%/app/assets/javascripts/protected_branch_dropdown.js.es6
-%%WWWDIR%%/app/assets/javascripts/protected_branch_edit.js.es6
-%%WWWDIR%%/app/assets/javascripts/protected_branch_edit_list.js.es6
+%%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js.es6
+%%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_create.js.es6
+%%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_dropdown.js.es6
+%%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_edit.js.es6
+%%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branch_edit_list.js.es6
+%%WWWDIR%%/app/assets/javascripts/protected_branches/protected_branches_bundle.js
%%WWWDIR%%/app/assets/javascripts/right_sidebar.js
%%WWWDIR%%/app/assets/javascripts/search.js
-%%WWWDIR%%/app/assets/javascripts/search_autocomplete.js
+%%WWWDIR%%/app/assets/javascripts/search_autocomplete.js.es6
%%WWWDIR%%/app/assets/javascripts/shortcuts.js
%%WWWDIR%%/app/assets/javascripts/shortcuts_blob.js
%%WWWDIR%%/app/assets/javascripts/shortcuts_dashboard_navigation.js
@@ -256,14 +271,15 @@
%%WWWDIR%%/app/assets/javascripts/syntax_highlight.js
%%WWWDIR%%/app/assets/javascripts/templates/issuable_template_selector.js.es6
%%WWWDIR%%/app/assets/javascripts/templates/issuable_template_selectors.js.es6
-%%WWWDIR%%/app/assets/javascripts/todos.js
+%%WWWDIR%%/app/assets/javascripts/todos.js.es6
%%WWWDIR%%/app/assets/javascripts/tree.js
%%WWWDIR%%/app/assets/javascripts/u2f/authenticate.js
%%WWWDIR%%/app/assets/javascripts/u2f/error.js
%%WWWDIR%%/app/assets/javascripts/u2f/register.js
%%WWWDIR%%/app/assets/javascripts/u2f/util.js
%%WWWDIR%%/app/assets/javascripts/user.js.es6
-%%WWWDIR%%/app/assets/javascripts/user_tabs.js
+%%WWWDIR%%/app/assets/javascripts/user_tabs.js.es6
+%%WWWDIR%%/app/assets/javascripts/username_validator.js.es6
%%WWWDIR%%/app/assets/javascripts/users/calendar.js
%%WWWDIR%%/app/assets/javascripts/users/users_bundle.js
%%WWWDIR%%/app/assets/javascripts/users_select.js
@@ -348,6 +364,7 @@
%%WWWDIR%%/app/assets/stylesheets/pages/labels.scss
%%WWWDIR%%/app/assets/stylesheets/pages/lint.scss
%%WWWDIR%%/app/assets/stylesheets/pages/login.scss
+%%WWWDIR%%/app/assets/stylesheets/pages/members.scss
%%WWWDIR%%/app/assets/stylesheets/pages/merge_conflicts.scss
%%WWWDIR%%/app/assets/stylesheets/pages/merge_requests.scss
%%WWWDIR%%/app/assets/stylesheets/pages/milestone.scss
@@ -402,7 +419,6 @@
%%WWWDIR%%/app/controllers/admin/users_controller.rb
%%WWWDIR%%/app/controllers/application_controller.rb
%%WWWDIR%%/app/controllers/autocomplete_controller.rb
-%%WWWDIR%%/app/controllers/ci/application_controller.rb
%%WWWDIR%%/app/controllers/ci/lints_controller.rb
%%WWWDIR%%/app/controllers/ci/projects_controller.rb
%%WWWDIR%%/app/controllers/concerns/authenticates_with_two_factor.rb
@@ -437,6 +453,7 @@
%%WWWDIR%%/app/controllers/groups/application_controller.rb
%%WWWDIR%%/app/controllers/groups/avatars_controller.rb
%%WWWDIR%%/app/controllers/groups/group_members_controller.rb
+%%WWWDIR%%/app/controllers/groups/labels_controller.rb
%%WWWDIR%%/app/controllers/groups/milestones_controller.rb
%%WWWDIR%%/app/controllers/groups_controller.rb
%%WWWDIR%%/app/controllers/health_check_controller.rb
@@ -451,7 +468,6 @@
%%WWWDIR%%/app/controllers/invites_controller.rb
%%WWWDIR%%/app/controllers/jwt_controller.rb
%%WWWDIR%%/app/controllers/koding_controller.rb
-%%WWWDIR%%/app/controllers/namespaces_controller.rb
%%WWWDIR%%/app/controllers/notification_settings_controller.rb
%%WWWDIR%%/app/controllers/oauth/applications_controller.rb
%%WWWDIR%%/app/controllers/oauth/authorizations_controller.rb
@@ -476,7 +492,6 @@
%%WWWDIR%%/app/controllers/projects/badges_controller.rb
%%WWWDIR%%/app/controllers/projects/blame_controller.rb
%%WWWDIR%%/app/controllers/projects/blob_controller.rb
-%%WWWDIR%%/app/controllers/projects/board_lists_controller.rb
%%WWWDIR%%/app/controllers/projects/boards/application_controller.rb
%%WWWDIR%%/app/controllers/projects/boards/issues_controller.rb
%%WWWDIR%%/app/controllers/projects/boards/lists_controller.rb
@@ -541,6 +556,7 @@
%%WWWDIR%%/app/controllers/uploads_controller.rb
%%WWWDIR%%/app/controllers/users_controller.rb
%%WWWDIR%%/app/finders/README.md
+%%WWWDIR%%/app/finders/access_requests_finder.rb
%%WWWDIR%%/app/finders/branches_finder.rb
%%WWWDIR%%/app/finders/contributed_projects_finder.rb
%%WWWDIR%%/app/finders/group_projects_finder.rb
@@ -548,6 +564,7 @@
%%WWWDIR%%/app/finders/issuable_finder.rb
%%WWWDIR%%/app/finders/issues_finder.rb
%%WWWDIR%%/app/finders/joined_groups_finder.rb
+%%WWWDIR%%/app/finders/labels_finder.rb
%%WWWDIR%%/app/finders/merge_requests_finder.rb
%%WWWDIR%%/app/finders/milestones_finder.rb
%%WWWDIR%%/app/finders/move_to_project_finder.rb
@@ -558,7 +575,6 @@
%%WWWDIR%%/app/finders/snippets_finder.rb
%%WWWDIR%%/app/finders/tags_finder.rb
%%WWWDIR%%/app/finders/todos_finder.rb
-%%WWWDIR%%/app/finders/trending_projects_finder.rb
%%WWWDIR%%/app/finders/union_finder.rb
%%WWWDIR%%/app/helpers/appearances_helper.rb
%%WWWDIR%%/app/helpers/application_helper.rb
@@ -567,8 +583,10 @@
%%WWWDIR%%/app/helpers/avatars_helper.rb
%%WWWDIR%%/app/helpers/award_emoji_helper.rb
%%WWWDIR%%/app/helpers/blob_helper.rb
+%%WWWDIR%%/app/helpers/boards_helper.rb
%%WWWDIR%%/app/helpers/branches_helper.rb
%%WWWDIR%%/app/helpers/broadcast_messages_helper.rb
+%%WWWDIR%%/app/helpers/builds_helper.rb
%%WWWDIR%%/app/helpers/button_helper.rb
%%WWWDIR%%/app/helpers/ci_status_helper.rb
%%WWWDIR%%/app/helpers/commits_helper.rb
@@ -632,6 +650,7 @@
%%WWWDIR%%/app/mailers/emails/members.rb
%%WWWDIR%%/app/mailers/emails/merge_requests.rb
%%WWWDIR%%/app/mailers/emails/notes.rb
+%%WWWDIR%%/app/mailers/emails/pipelines.rb
%%WWWDIR%%/app/mailers/emails/profile.rb
%%WWWDIR%%/app/mailers/emails/projects.rb
%%WWWDIR%%/app/mailers/notify.rb
@@ -658,6 +677,7 @@
%%WWWDIR%%/app/models/compare.rb
%%WWWDIR%%/app/models/concerns/access_requestable.rb
%%WWWDIR%%/app/models/concerns/awardable.rb
+%%WWWDIR%%/app/models/concerns/cache_markdown_field.rb
%%WWWDIR%%/app/models/concerns/case_sensitivity.rb
%%WWWDIR%%/app/models/concerns/expirable.rb
%%WWWDIR%%/app/models/concerns/faster_cache_keys.rb
@@ -694,6 +714,8 @@
%%WWWDIR%%/app/models/global_label.rb
%%WWWDIR%%/app/models/global_milestone.rb
%%WWWDIR%%/app/models/group.rb
+%%WWWDIR%%/app/models/group_label.rb
+%%WWWDIR%%/app/models/guest.rb
%%WWWDIR%%/app/models/hooks/project_hook.rb
%%WWWDIR%%/app/models/hooks/service_hook.rb
%%WWWDIR%%/app/models/hooks/system_hook.rb
@@ -704,6 +726,7 @@
%%WWWDIR%%/app/models/key.rb
%%WWWDIR%%/app/models/label.rb
%%WWWDIR%%/app/models/label_link.rb
+%%WWWDIR%%/app/models/label_priority.rb
%%WWWDIR%%/app/models/legacy_diff_note.rb
%%WWWDIR%%/app/models/lfs_object.rb
%%WWWDIR%%/app/models/lfs_objects_project.rb
@@ -728,6 +751,7 @@
%%WWWDIR%%/app/models/project_feature.rb
%%WWWDIR%%/app/models/project_group_link.rb
%%WWWDIR%%/app/models/project_import_data.rb
+%%WWWDIR%%/app/models/project_label.rb
%%WWWDIR%%/app/models/project_services/asana_service.rb
%%WWWDIR%%/app/models/project_services/assembla_service.rb
%%WWWDIR%%/app/models/project_services/bamboo_service.rb
@@ -748,6 +772,7 @@
%%WWWDIR%%/app/models/project_services/irker_service.rb
%%WWWDIR%%/app/models/project_services/issue_tracker_service.rb
%%WWWDIR%%/app/models/project_services/jira_service.rb
+%%WWWDIR%%/app/models/project_services/pipelines_email_service.rb
%%WWWDIR%%/app/models/project_services/pivotaltracker_service.rb
%%WWWDIR%%/app/models/project_services/pushover_service.rb
%%WWWDIR%%/app/models/project_services/redmine_service.rb
@@ -777,6 +802,7 @@
%%WWWDIR%%/app/models/subscription.rb
%%WWWDIR%%/app/models/todo.rb
%%WWWDIR%%/app/models/tree.rb
+%%WWWDIR%%/app/models/trending_project.rb
%%WWWDIR%%/app/models/u2f_registration.rb
%%WWWDIR%%/app/models/user.rb
%%WWWDIR%%/app/models/user_agent_detail.rb
@@ -790,6 +816,7 @@
%%WWWDIR%%/app/policies/environment_policy.rb
%%WWWDIR%%/app/policies/external_issue_policy.rb
%%WWWDIR%%/app/policies/global_policy.rb
+%%WWWDIR%%/app/policies/group_label_policy.rb
%%WWWDIR%%/app/policies/group_member_policy.rb
%%WWWDIR%%/app/policies/group_policy.rb
%%WWWDIR%%/app/policies/issuable_policy.rb
@@ -798,6 +825,7 @@
%%WWWDIR%%/app/policies/namespace_policy.rb
%%WWWDIR%%/app/policies/note_policy.rb
%%WWWDIR%%/app/policies/personal_snippet_policy.rb
+%%WWWDIR%%/app/policies/project_label_policy.rb
%%WWWDIR%%/app/policies/project_member_policy.rb
%%WWWDIR%%/app/policies/project_policy.rb
%%WWWDIR%%/app/policies/project_snippet_policy.rb
@@ -806,13 +834,15 @@
%%WWWDIR%%/app/services/audit_event_service.rb
%%WWWDIR%%/app/services/auth/container_registry_authentication_service.rb
%%WWWDIR%%/app/services/base_service.rb
-%%WWWDIR%%/app/services/boards/base_service.rb
%%WWWDIR%%/app/services/boards/create_service.rb
+%%WWWDIR%%/app/services/boards/issues/create_service.rb
%%WWWDIR%%/app/services/boards/issues/list_service.rb
%%WWWDIR%%/app/services/boards/issues/move_service.rb
+%%WWWDIR%%/app/services/boards/list_service.rb
%%WWWDIR%%/app/services/boards/lists/create_service.rb
%%WWWDIR%%/app/services/boards/lists/destroy_service.rb
%%WWWDIR%%/app/services/boards/lists/generate_service.rb
+%%WWWDIR%%/app/services/boards/lists/list_service.rb
%%WWWDIR%%/app/services/boards/lists/move_service.rb
%%WWWDIR%%/app/services/ci/create_pipeline_builds_service.rb
%%WWWDIR%%/app/services/ci/create_pipeline_service.rb
@@ -820,6 +850,7 @@
%%WWWDIR%%/app/services/ci/image_for_build_service.rb
%%WWWDIR%%/app/services/ci/process_pipeline_service.rb
%%WWWDIR%%/app/services/ci/register_build_service.rb
+%%WWWDIR%%/app/services/ci/send_pipeline_notification_service.rb
%%WWWDIR%%/app/services/commits/change_service.rb
%%WWWDIR%%/app/services/commits/cherry_pick_service.rb
%%WWWDIR%%/app/services/commits/revert_service.rb
@@ -838,6 +869,7 @@
%%WWWDIR%%/app/services/files/create_dir_service.rb
%%WWWDIR%%/app/services/files/create_service.rb
%%WWWDIR%%/app/services/files/delete_service.rb
+%%WWWDIR%%/app/services/files/multi_service.rb
%%WWWDIR%%/app/services/files/update_service.rb
%%WWWDIR%%/app/services/git_hooks_service.rb
%%WWWDIR%%/app/services/git_push_service.rb
@@ -856,9 +888,14 @@
%%WWWDIR%%/app/services/issues/move_service.rb
%%WWWDIR%%/app/services/issues/reopen_service.rb
%%WWWDIR%%/app/services/issues/update_service.rb
+%%WWWDIR%%/app/services/labels/find_or_create_service.rb
+%%WWWDIR%%/app/services/labels/transfer_service.rb
+%%WWWDIR%%/app/services/members/approve_access_request_service.rb
%%WWWDIR%%/app/services/members/authorized_destroy_service.rb
%%WWWDIR%%/app/services/members/destroy_service.rb
+%%WWWDIR%%/app/services/members/request_access_service.rb
%%WWWDIR%%/app/services/merge_requests/add_todo_when_build_fails_service.rb
+%%WWWDIR%%/app/services/merge_requests/assign_issues_service.rb
%%WWWDIR%%/app/services/merge_requests/base_service.rb
%%WWWDIR%%/app/services/merge_requests/build_service.rb
%%WWWDIR%%/app/services/merge_requests/close_service.rb
@@ -901,6 +938,8 @@
%%WWWDIR%%/app/services/projects/unlink_fork_service.rb
%%WWWDIR%%/app/services/projects/update_service.rb
%%WWWDIR%%/app/services/projects/upload_service.rb
+%%WWWDIR%%/app/services/protected_branches/api_create_service.rb
+%%WWWDIR%%/app/services/protected_branches/api_update_service.rb
%%WWWDIR%%/app/services/protected_branches/create_service.rb
%%WWWDIR%%/app/services/protected_branches/update_service.rb
%%WWWDIR%%/app/services/repair_ldap_blocked_user_service.rb
@@ -1016,6 +1055,7 @@
%%WWWDIR%%/app/views/dashboard/_sidebar.html.haml
%%WWWDIR%%/app/views/dashboard/_snippets_head.html.haml
%%WWWDIR%%/app/views/dashboard/activity.html.haml
+%%WWWDIR%%/app/views/dashboard/groups/_empty_state.html.haml
%%WWWDIR%%/app/views/dashboard/groups/index.html.haml
%%WWWDIR%%/app/views/dashboard/issues.atom.builder
%%WWWDIR%%/app/views/dashboard/issues.html.haml
@@ -1055,6 +1095,9 @@
%%WWWDIR%%/app/views/devise/shared/_sign_in_link.html.haml
%%WWWDIR%%/app/views/devise/shared/_signin_box.html.haml
%%WWWDIR%%/app/views/devise/shared/_signup_box.html.haml
+%%WWWDIR%%/app/views/devise/shared/_tab_single.html.haml
+%%WWWDIR%%/app/views/devise/shared/_tabs_ldap.html.haml
+%%WWWDIR%%/app/views/devise/shared/_tabs_normal.html.haml
%%WWWDIR%%/app/views/devise/unlocks/new.html.haml
%%WWWDIR%%/app/views/discussions/_diff_discussion.html.haml
%%WWWDIR%%/app/views/discussions/_diff_with_notes.html.haml
@@ -1117,6 +1160,10 @@
%%WWWDIR%%/app/views/groups/group_members/update.js.haml
%%WWWDIR%%/app/views/groups/issues.atom.builder
%%WWWDIR%%/app/views/groups/issues.html.haml
+%%WWWDIR%%/app/views/groups/labels/destroy.js.haml
+%%WWWDIR%%/app/views/groups/labels/edit.html.haml
+%%WWWDIR%%/app/views/groups/labels/index.html.haml
+%%WWWDIR%%/app/views/groups/labels/new.html.haml
%%WWWDIR%%/app/views/groups/merge_requests.html.haml
%%WWWDIR%%/app/views/groups/milestones/_header_title.html.haml
%%WWWDIR%%/app/views/groups/milestones/_milestone.html.haml
@@ -1251,6 +1298,10 @@
%%WWWDIR%%/app/views/notify/note_merge_request_email.text.erb
%%WWWDIR%%/app/views/notify/note_snippet_email.html.haml
%%WWWDIR%%/app/views/notify/note_snippet_email.text.erb
+%%WWWDIR%%/app/views/notify/pipeline_failed_email.html.haml
+%%WWWDIR%%/app/views/notify/pipeline_failed_email.text.erb
+%%WWWDIR%%/app/views/notify/pipeline_success_email.html.haml
+%%WWWDIR%%/app/views/notify/pipeline_success_email.text.erb
%%WWWDIR%%/app/views/notify/project_was_exported_email.html.haml
%%WWWDIR%%/app/views/notify/project_was_exported_email.text.erb
%%WWWDIR%%/app/views/notify/project_was_moved_email.html.haml
@@ -1297,6 +1348,7 @@
%%WWWDIR%%/app/views/projects/_activity.html.haml
%%WWWDIR%%/app/views/projects/_bitbucket_import_modal.html.haml
%%WWWDIR%%/app/views/projects/_commit_button.html.haml
+%%WWWDIR%%/app/views/projects/_customize_workflow.html.haml
%%WWWDIR%%/app/views/projects/_errors.html.haml
%%WWWDIR%%/app/views/projects/_files.html.haml
%%WWWDIR%%/app/views/projects/_find_file_link.html.haml
@@ -1307,6 +1359,7 @@
%%WWWDIR%%/app/views/projects/_md_preview.html.haml
%%WWWDIR%%/app/views/projects/_merge_request_settings.html.haml
%%WWWDIR%%/app/views/projects/_readme.html.haml
+%%WWWDIR%%/app/views/projects/_wiki.html.haml
%%WWWDIR%%/app/views/projects/_zen.html.haml
%%WWWDIR%%/app/views/projects/activity.html.haml
%%WWWDIR%%/app/views/projects/artifacts/_tree_directory.html.haml
@@ -1331,6 +1384,7 @@
%%WWWDIR%%/app/views/projects/boards/components/_blank_state.html.haml
%%WWWDIR%%/app/views/projects/boards/components/_board.html.haml
%%WWWDIR%%/app/views/projects/boards/components/_card.html.haml
+%%WWWDIR%%/app/views/projects/boards/index.html.haml
%%WWWDIR%%/app/views/projects/boards/show.html.haml
%%WWWDIR%%/app/views/projects/branches/_branch.html.haml
%%WWWDIR%%/app/views/projects/branches/_commit.html.haml
@@ -1361,6 +1415,7 @@
%%WWWDIR%%/app/views/projects/commit/_pipelines_list.haml
%%WWWDIR%%/app/views/projects/commit/branches.html.haml
%%WWWDIR%%/app/views/projects/commit/builds.html.haml
+%%WWWDIR%%/app/views/projects/commit/pipelines.html.haml
%%WWWDIR%%/app/views/projects/commit/show.html.haml
%%WWWDIR%%/app/views/projects/commits/_commit.atom.builder
%%WWWDIR%%/app/views/projects/commits/_commit.html.haml
@@ -1384,6 +1439,7 @@
%%WWWDIR%%/app/views/projects/deployments/_actions.haml
%%WWWDIR%%/app/views/projects/deployments/_commit.html.haml
%%WWWDIR%%/app/views/projects/deployments/_deployment.html.haml
+%%WWWDIR%%/app/views/projects/deployments/_rollback.haml
%%WWWDIR%%/app/views/projects/diffs/_content.html.haml
%%WWWDIR%%/app/views/projects/diffs/_diffs.html.haml
%%WWWDIR%%/app/views/projects/diffs/_file.html.haml
@@ -1397,8 +1453,10 @@
%%WWWDIR%%/app/views/projects/edit.html.haml
%%WWWDIR%%/app/views/projects/empty.html.haml
%%WWWDIR%%/app/views/projects/environments/_environment.html.haml
+%%WWWDIR%%/app/views/projects/environments/_external_url.html.haml
%%WWWDIR%%/app/views/projects/environments/_form.html.haml
%%WWWDIR%%/app/views/projects/environments/_header_title.html.haml
+%%WWWDIR%%/app/views/projects/environments/_stop.html.haml
%%WWWDIR%%/app/views/projects/environments/edit.html.haml
%%WWWDIR%%/app/views/projects/environments/index.html.haml
%%WWWDIR%%/app/views/projects/environments/new.html.haml
@@ -1419,6 +1477,7 @@
%%WWWDIR%%/app/views/projects/graphs/languages.html.haml
%%WWWDIR%%/app/views/projects/graphs/show.html.haml
%%WWWDIR%%/app/views/projects/group_links/index.html.haml
+%%WWWDIR%%/app/views/projects/group_links/update.js.haml
%%WWWDIR%%/app/views/projects/hooks/_project_hook.html.haml
%%WWWDIR%%/app/views/projects/hooks/index.html.haml
%%WWWDIR%%/app/views/projects/imports/new.html.haml
@@ -1438,8 +1497,6 @@
%%WWWDIR%%/app/views/projects/issues/index.html.haml
%%WWWDIR%%/app/views/projects/issues/new.html.haml
%%WWWDIR%%/app/views/projects/issues/show.html.haml
-%%WWWDIR%%/app/views/projects/labels/_form.html.haml
-%%WWWDIR%%/app/views/projects/labels/_label.html.haml
%%WWWDIR%%/app/views/projects/labels/destroy.js.haml
%%WWWDIR%%/app/views/projects/labels/edit.html.haml
%%WWWDIR%%/app/views/projects/labels/index.html.haml
@@ -1449,6 +1506,7 @@
%%WWWDIR%%/app/views/projects/merge_requests/_merge_request.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/_merge_requests.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/_new_compare.html.haml
+%%WWWDIR%%/app/views/projects/merge_requests/_new_diffs.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/_new_submit.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/_show.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/branch_from.html.haml
@@ -1456,9 +1514,12 @@
%%WWWDIR%%/app/views/projects/merge_requests/cancel_merge_when_build_succeeds.js.haml
%%WWWDIR%%/app/views/projects/merge_requests/conflicts.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
-%%WWWDIR%%/app/views/projects/merge_requests/conflicts/_inline_view.html.haml
-%%WWWDIR%%/app/views/projects/merge_requests/conflicts/_parallel_view.html.haml
+%%WWWDIR%%/app/views/projects/merge_requests/conflicts/_file_actions.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
+%%WWWDIR%%/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml
+%%WWWDIR%%/app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml
+%%WWWDIR%%/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_line.html.haml
+%%WWWDIR%%/app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/diffs.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/dropdowns/_branch.html.haml
%%WWWDIR%%/app/views/projects/merge_requests/dropdowns/_project.html.haml
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list