Date: Wed, 19 Oct 2016 14:22:31 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424254 - in head/www/gitlab: . files Message-ID: <201610191422.u9JEMVST079876@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Wed Oct 19 14:22:31 2016 New Revision: 424254 URL: https://svnweb.freebsd.org/changeset/ports/424254 Log: 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) 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 Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/Makefile Wed Oct 19 14:22:31 2016 (r424254) @@ -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 Modified: head/www/gitlab/distinfo ============================================================================== --- head/www/gitlab/distinfo Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/distinfo Wed Oct 19 14:22:31 2016 (r424254) @@ -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 Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/files/patch-Gemfile Wed Oct 19 14:22:31 2016 (r424254) @@ -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' Modified: head/www/gitlab/files/patch-config_database.yml.postgresql ============================================================================== --- head/www/gitlab/files/patch-config_database.yml.postgresql Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/files/patch-config_database.yml.postgresql Wed Oct 19 14:22:31 2016 (r424254) @@ -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 Modified: head/www/gitlab/files/patch-config_gitlab.yml.example ============================================================================== --- head/www/gitlab/files/patch-config_gitlab.yml.example Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/files/patch-config_gitlab.yml.example Wed Oct 19 14:22:31 2016 (r424254) @@ -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: Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb ============================================================================== --- head/www/gitlab/files/patch-config_initializers_1__settings.rb Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/files/patch-config_initializers_1__settings.rb Wed Oct 19 14:22:31 2016 (r424254) @@ -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' Modified: head/www/gitlab/files/patch-config_unicorn.rb.example ============================================================================== --- head/www/gitlab/files/patch-config_unicorn.rb.example Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/files/patch-config_unicorn.rb.example Wed Oct 19 14:22:31 2016 (r424254) @@ -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 Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab ============================================================================== --- head/www/gitlab/files/patch-lib_support_nginx_gitlab Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/files/patch-lib_support_nginx_gitlab Wed Oct 19 14:22:31 2016 (r424254) @@ -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. Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl ============================================================================== --- head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Wed Oct 19 14:22:31 2016 (r424254) @@ -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. Modified: head/www/gitlab/pkg-message ============================================================================== --- head/www/gitlab/pkg-message Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/pkg-message Wed Oct 19 14:22:31 2016 (r424254) @@ -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 Modified: head/www/gitlab/pkg-plist ============================================================================== --- head/www/gitlab/pkg-plist Wed Oct 19 14:16:55 2016 (r424253) +++ head/www/gitlab/pkg-plist Wed Oct 19 14:22:31 2016 (r424254) @@ -5,14 +5,13 @@ %%WWWDIR%%/.github/ISSUE_TEMPLATE.md %%WWWDIR%%/.github/PULL_REQUEST_TEMPLATE.md %%WWWDIR%%/.gitlab-ci.yml -%%WWWDIR%%/.hound.yml %%WWWDIR%%/.pkgr.yml %%WWWDIR%%/.rspec %%WWWDIR%%/.rubocop.yml +%%WWWDIR%%/.rubocop_todo.yml %%WWWDIR%%/.ruby-version %%WWWDIR%%/.scss-lint.yml %%WWWDIR%%/.simplecov -%%WWWDIR%%/.teatro.yml %%WWWDIR%%/.vagrant_enabled %%WWWDIR%%/CHANGELOG %%WWWDIR%%/CONTRIBUTING.md @@ -118,15 +117,14 @@ %%WWWDIR%%/app/assets/javascripts/blob/template_selector.js.coffee %%WWWDIR%%/app/assets/javascripts/breakpoints.coffee %%WWWDIR%%/app/assets/javascripts/broadcast_message.js.coffee +%%WWWDIR%%/app/assets/javascripts/build.coffee %%WWWDIR%%/app/assets/javascripts/build_artifacts.js.coffee -%%WWWDIR%%/app/assets/javascripts/ci/application.js.coffee -%%WWWDIR%%/app/assets/javascripts/ci/build.coffee -%%WWWDIR%%/app/assets/javascripts/ci/projects.js.coffee %%WWWDIR%%/app/assets/javascripts/commit.js.coffee %%WWWDIR%%/app/assets/javascripts/commit/file.js.coffee %%WWWDIR%%/app/assets/javascripts/commit/image-file.js.coffee %%WWWDIR%%/app/assets/javascripts/commits.js.coffee %%WWWDIR%%/app/assets/javascripts/compare.js.coffee +%%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js.coffee %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js.coffee %%WWWDIR%%/app/assets/javascripts/copy_to_clipboard.js.coffee %%WWWDIR%%/app/assets/javascripts/diff.js.coffee @@ -135,12 +133,12 @@ %%WWWDIR%%/app/assets/javascripts/due_date_select.js.coffee %%WWWDIR%%/app/assets/javascripts/extensions/array.js %%WWWDIR%%/app/assets/javascripts/extensions/jquery.js.coffee +%%WWWDIR%%/app/assets/javascripts/files_comment_button.js.coffee %%WWWDIR%%/app/assets/javascripts/flash.js.coffee %%WWWDIR%%/app/assets/javascripts/gfm_auto_complete.js.coffee -%%WWWDIR%%/app/assets/javascripts/gl_crop.js.coffee %%WWWDIR%%/app/assets/javascripts/gl_dropdown.js.coffee %%WWWDIR%%/app/assets/javascripts/gl_form.js.coffee -%%WWWDIR%%/app/assets/javascripts/graphs/application.js.coffee +%%WWWDIR%%/app/assets/javascripts/graphs/graphs_bundle.js.coffee %%WWWDIR%%/app/assets/javascripts/graphs/stat_graph.js.coffee %%WWWDIR%%/app/assets/javascripts/graphs/stat_graph_contributors.js.coffee %%WWWDIR%%/app/assets/javascripts/graphs/stat_graph_contributors_graph.js.coffee @@ -158,16 +156,21 @@ %%WWWDIR%%/app/assets/javascripts/labels.js.coffee %%WWWDIR%%/app/assets/javascripts/labels_select.js.coffee %%WWWDIR%%/app/assets/javascripts/layout_nav.js.coffee -%%WWWDIR%%/app/assets/javascripts/lib/animate.js.coffee -%%WWWDIR%%/app/assets/javascripts/lib/common_utils.js.coffee -%%WWWDIR%%/app/assets/javascripts/lib/datetime_utility.js.coffee -%%WWWDIR%%/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb -%%WWWDIR%%/app/assets/javascripts/lib/jquery.timeago.js -%%WWWDIR%%/app/assets/javascripts/lib/md5.js -%%WWWDIR%%/app/assets/javascripts/lib/notify.js.coffee -%%WWWDIR%%/app/assets/javascripts/lib/type_utility.js.coffee -%%WWWDIR%%/app/assets/javascripts/lib/url_utility.js.coffee -%%WWWDIR%%/app/assets/javascripts/lib/utf8_encode.js +%%WWWDIR%%/app/assets/javascripts/lib/chart.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/cropper.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/d3.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/raphael.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/utils/animate.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/utils/common_utils.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/utils/datetime_utility.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb +%%WWWDIR%%/app/assets/javascripts/lib/utils/jquery.timeago.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/md5.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/notify.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/utils/text_utility.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/utils/type_utility.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/utils/url_utility.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/utils/utf8_encode.js %%WWWDIR%%/app/assets/javascripts/line_highlighter.js.coffee %%WWWDIR%%/app/assets/javascripts/logo.js.coffee %%WWWDIR%%/app/assets/javascripts/markdown_preview.js.coffee @@ -178,16 +181,18 @@ %%WWWDIR%%/app/assets/javascripts/milestone.js.coffee %%WWWDIR%%/app/assets/javascripts/milestone_select.js.coffee %%WWWDIR%%/app/assets/javascripts/namespace_select.js.coffee -%%WWWDIR%%/app/assets/javascripts/network/application.js.coffee %%WWWDIR%%/app/assets/javascripts/network/branch-graph.js.coffee %%WWWDIR%%/app/assets/javascripts/network/network.js.coffee +%%WWWDIR%%/app/assets/javascripts/network/network_bundle.js.coffee %%WWWDIR%%/app/assets/javascripts/new_branch_form.js.coffee %%WWWDIR%%/app/assets/javascripts/new_commit_form.js.coffee %%WWWDIR%%/app/assets/javascripts/notes.js.coffee %%WWWDIR%%/app/assets/javascripts/notifications_dropdown.js.coffee %%WWWDIR%%/app/assets/javascripts/notifications_form.js.coffee %%WWWDIR%%/app/assets/javascripts/pager.js.coffee -%%WWWDIR%%/app/assets/javascripts/profile.js.coffee +%%WWWDIR%%/app/assets/javascripts/profile/gl_crop.js.coffee +%%WWWDIR%%/app/assets/javascripts/profile/profile.js.coffee +%%WWWDIR%%/app/assets/javascripts/profile/profile_bundle.js.coffee %%WWWDIR%%/app/assets/javascripts/project.js.coffee %%WWWDIR%%/app/assets/javascripts/project_avatar.js.coffee %%WWWDIR%%/app/assets/javascripts/project_find_file.js.coffee @@ -198,6 +203,7 @@ %%WWWDIR%%/app/assets/javascripts/project_select.js.coffee %%WWWDIR%%/app/assets/javascripts/project_show.js.coffee %%WWWDIR%%/app/assets/javascripts/projects_list.js.coffee +%%WWWDIR%%/app/assets/javascripts/protected_branch_select.js.coffee %%WWWDIR%%/app/assets/javascripts/protected_branches.js.coffee %%WWWDIR%%/app/assets/javascripts/right_sidebar.js.coffee %%WWWDIR%%/app/assets/javascripts/search.js.coffee @@ -210,19 +216,21 @@ %%WWWDIR%%/app/assets/javascripts/shortcuts_navigation.coffee %%WWWDIR%%/app/assets/javascripts/shortcuts_network.js.coffee %%WWWDIR%%/app/assets/javascripts/sidebar.js.coffee +%%WWWDIR%%/app/assets/javascripts/single_file_diff.js.coffee %%WWWDIR%%/app/assets/javascripts/star.js.coffee %%WWWDIR%%/app/assets/javascripts/subscription.js.coffee +%%WWWDIR%%/app/assets/javascripts/subscription_select.js.coffee %%WWWDIR%%/app/assets/javascripts/syntax_highlight.coffee %%WWWDIR%%/app/assets/javascripts/todos.js.coffee %%WWWDIR%%/app/assets/javascripts/tree.js.coffee %%WWWDIR%%/app/assets/javascripts/u2f/authenticate.js.coffee %%WWWDIR%%/app/assets/javascripts/u2f/error.js.coffee %%WWWDIR%%/app/assets/javascripts/u2f/register.js.coffee -%%WWWDIR%%/app/assets/javascripts/u2f/util.js.coffee.erb +%%WWWDIR%%/app/assets/javascripts/u2f/util.js.coffee %%WWWDIR%%/app/assets/javascripts/user.js.coffee %%WWWDIR%%/app/assets/javascripts/user_tabs.js.coffee -%%WWWDIR%%/app/assets/javascripts/users/application.js.coffee %%WWWDIR%%/app/assets/javascripts/users/calendar.js.coffee +%%WWWDIR%%/app/assets/javascripts/users/users_bundle.js.coffee %%WWWDIR%%/app/assets/javascripts/users_select.js.coffee %%WWWDIR%%/app/assets/javascripts/wikis.js.coffee %%WWWDIR%%/app/assets/javascripts/zen_mode.js.coffee @@ -318,6 +326,7 @@ %%WWWDIR%%/app/assets/stylesheets/pages/snippets.scss %%WWWDIR%%/app/assets/stylesheets/pages/stat_graph.scss %%WWWDIR%%/app/assets/stylesheets/pages/status.scss +%%WWWDIR%%/app/assets/stylesheets/pages/tags.scss %%WWWDIR%%/app/assets/stylesheets/pages/todos.scss %%WWWDIR%%/app/assets/stylesheets/pages/tree.scss %%WWWDIR%%/app/assets/stylesheets/pages/ui_dev_kit.scss @@ -349,6 +358,7 @@ %%WWWDIR%%/app/controllers/admin/runners_controller.rb %%WWWDIR%%/app/controllers/admin/services_controller.rb %%WWWDIR%%/app/controllers/admin/spam_logs_controller.rb +%%WWWDIR%%/app/controllers/admin/system_info_controller.rb %%WWWDIR%%/app/controllers/admin/users_controller.rb %%WWWDIR%%/app/controllers/application_controller.rb %%WWWDIR%%/app/controllers/autocomplete_controller.rb @@ -358,12 +368,14 @@ %%WWWDIR%%/app/controllers/concerns/authenticates_with_two_factor.rb %%WWWDIR%%/app/controllers/concerns/continue_params.rb %%WWWDIR%%/app/controllers/concerns/creates_commit.rb +%%WWWDIR%%/app/controllers/concerns/diff_for_path.rb %%WWWDIR%%/app/controllers/concerns/filter_projects.rb %%WWWDIR%%/app/controllers/concerns/global_milestones.rb %%WWWDIR%%/app/controllers/concerns/issuable_actions.rb %%WWWDIR%%/app/controllers/concerns/issues_action.rb %%WWWDIR%%/app/controllers/concerns/membership_actions.rb %%WWWDIR%%/app/controllers/concerns/merge_requests_action.rb +%%WWWDIR%%/app/controllers/concerns/service_params.rb %%WWWDIR%%/app/controllers/concerns/toggle_award_emoji.rb %%WWWDIR%%/app/controllers/concerns/toggle_subscription_action.rb %%WWWDIR%%/app/controllers/confirmations_controller.rb @@ -443,6 +455,7 @@ %%WWWDIR%%/app/controllers/projects/network_controller.rb %%WWWDIR%%/app/controllers/projects/notes_controller.rb %%WWWDIR%%/app/controllers/projects/pipelines_controller.rb +%%WWWDIR%%/app/controllers/projects/pipelines_settings_controller.rb %%WWWDIR%%/app/controllers/projects/project_members_controller.rb %%WWWDIR%%/app/controllers/projects/protected_branches_controller.rb %%WWWDIR%%/app/controllers/projects/raw_controller.rb @@ -474,6 +487,7 @@ %%WWWDIR%%/app/controllers/uploads_controller.rb %%WWWDIR%%/app/controllers/users_controller.rb %%WWWDIR%%/app/finders/README.md +%%WWWDIR%%/app/finders/branches_finder.rb %%WWWDIR%%/app/finders/contributed_projects_finder.rb %%WWWDIR%%/app/finders/group_projects_finder.rb %%WWWDIR%%/app/finders/groups_finder.rb @@ -494,6 +508,7 @@ %%WWWDIR%%/app/helpers/application_helper.rb %%WWWDIR%%/app/helpers/application_settings_helper.rb %%WWWDIR%%/app/helpers/auth_helper.rb +%%WWWDIR%%/app/helpers/avatars_helper.rb %%WWWDIR%%/app/helpers/blob_helper.rb %%WWWDIR%%/app/helpers/branches_helper.rb %%WWWDIR%%/app/helpers/broadcast_messages_helper.rb @@ -519,6 +534,7 @@ %%WWWDIR%%/app/helpers/issuables_helper.rb %%WWWDIR%%/app/helpers/issues_helper.rb %%WWWDIR%%/app/helpers/javascript_helper.rb +%%WWWDIR%%/app/helpers/kerberos_spnego_helper.rb %%WWWDIR%%/app/helpers/labels_helper.rb %%WWWDIR%%/app/helpers/members_helper.rb %%WWWDIR%%/app/helpers/merge_requests_helper.rb @@ -533,6 +549,7 @@ %%WWWDIR%%/app/helpers/runners_helper.rb %%WWWDIR%%/app/helpers/search_helper.rb %%WWWDIR%%/app/helpers/selects_helper.rb +%%WWWDIR%%/app/helpers/services_helper.rb %%WWWDIR%%/app/helpers/snippets_helper.rb %%WWWDIR%%/app/helpers/sorting_helper.rb %%WWWDIR%%/app/helpers/submodule_helper.rb @@ -542,6 +559,7 @@ %%WWWDIR%%/app/helpers/todos_helper.rb %%WWWDIR%%/app/helpers/tree_helper.rb %%WWWDIR%%/app/helpers/triggers_helper.rb +%%WWWDIR%%/app/helpers/u2f_helper.rb %%WWWDIR%%/app/helpers/version_check_helper.rb %%WWWDIR%%/app/helpers/visibility_level_helper.rb %%WWWDIR%%/app/helpers/workhorse_helper.rb @@ -584,6 +602,7 @@ %%WWWDIR%%/app/models/concerns/issuable.rb %%WWWDIR%%/app/models/concerns/mentionable.rb %%WWWDIR%%/app/models/concerns/milestoneish.rb +%%WWWDIR%%/app/models/concerns/note_on_diff.rb %%WWWDIR%%/app/models/concerns/participable.rb %%WWWDIR%%/app/models/concerns/referable.rb %%WWWDIR%%/app/models/concerns/sortable.rb @@ -595,6 +614,7 @@ %%WWWDIR%%/app/models/deploy_key.rb %%WWWDIR%%/app/models/deploy_keys_project.rb %%WWWDIR%%/app/models/deployment.rb +%%WWWDIR%%/app/models/diff_note.rb %%WWWDIR%%/app/models/email.rb %%WWWDIR%%/app/models/environment.rb %%WWWDIR%%/app/models/event.rb @@ -636,6 +656,7 @@ %%WWWDIR%%/app/models/project_services/asana_service.rb %%WWWDIR%%/app/models/project_services/assembla_service.rb %%WWWDIR%%/app/models/project_services/bamboo_service.rb +%%WWWDIR%%/app/models/project_services/bugzilla_service.rb %%WWWDIR%%/app/models/project_services/buildkite_service.rb %%WWWDIR%%/app/models/project_services/builds_email_service.rb %%WWWDIR%%/app/models/project_services/campfire_service.rb @@ -720,6 +741,7 @@ %%WWWDIR%%/app/services/groups/base_service.rb %%WWWDIR%%/app/services/groups/create_service.rb %%WWWDIR%%/app/services/groups/update_service.rb +%%WWWDIR%%/app/services/import_export_clean_up_service.rb %%WWWDIR%%/app/services/issuable_base_service.rb %%WWWDIR%%/app/services/issues/base_service.rb %%WWWDIR%%/app/services/issues/bulk_update_service.rb @@ -748,6 +770,7 @@ %%WWWDIR%%/app/services/milestones/update_service.rb %%WWWDIR%%/app/services/notes/create_service.rb %%WWWDIR%%/app/services/notes/delete_service.rb +%%WWWDIR%%/app/services/notes/diff_position_update_service.rb %%WWWDIR%%/app/services/notes/post_process_service.rb %%WWWDIR%%/app/services/notes/update_service.rb %%WWWDIR%%/app/services/notification_service.rb @@ -766,6 +789,7 @@ %%WWWDIR%%/app/services/projects/update_service.rb %%WWWDIR%%/app/services/projects/upload_service.rb %%WWWDIR%%/app/services/repair_ldap_blocked_user_service.rb +%%WWWDIR%%/app/services/repository_archive_clean_up_service.rb %%WWWDIR%%/app/services/search/global_service.rb %%WWWDIR%%/app/services/search/project_service.rb %%WWWDIR%%/app/services/search/snippet_service.rb @@ -784,6 +808,7 @@ %%WWWDIR%%/app/uploaders/file_uploader.rb %%WWWDIR%%/app/uploaders/lfs_object_uploader.rb %%WWWDIR%%/app/uploaders/uploader_helper.rb +%%WWWDIR%%/app/validators/addressable_url_validator.rb %%WWWDIR%%/app/validators/color_validator.rb %%WWWDIR%%/app/validators/email_validator.rb %%WWWDIR%%/app/validators/line_code_validator.rb @@ -850,10 +875,12 @@ %%WWWDIR%%/app/views/admin/services/index.html.haml %%WWWDIR%%/app/views/admin/spam_logs/_spam_log.html.haml %%WWWDIR%%/app/views/admin/spam_logs/index.html.haml +%%WWWDIR%%/app/views/admin/system_info/show.html.haml %%WWWDIR%%/app/views/admin/users/_form.html.haml %%WWWDIR%%/app/views/admin/users/_head.html.haml %%WWWDIR%%/app/views/admin/users/_profile.html.haml %%WWWDIR%%/app/views/admin/users/_projects.html.haml +%%WWWDIR%%/app/views/admin/users/_user.html.haml %%WWWDIR%%/app/views/admin/users/edit.html.haml %%WWWDIR%%/app/views/admin/users/groups.html.haml %%WWWDIR%%/app/views/admin/users/index.html.haml @@ -862,11 +889,8 @@ %%WWWDIR%%/app/views/admin/users/projects.html.haml %%WWWDIR%%/app/views/admin/users/show.html.haml %%WWWDIR%%/app/views/award_emoji/_awards_block.html.haml -%%WWWDIR%%/app/views/ci/errors/show.haml %%WWWDIR%%/app/views/ci/lints/_create.html.haml %%WWWDIR%%/app/views/ci/lints/show.html.haml -%%WWWDIR%%/app/views/ci/shared/_guide.html.haml -%%WWWDIR%%/app/views/ci/shared/_no_runners.html.haml %%WWWDIR%%/app/views/dashboard/_activities.html.haml %%WWWDIR%%/app/views/dashboard/_activity_head.html.haml %%WWWDIR%%/app/views/dashboard/_groups_head.html.haml @@ -941,6 +965,7 @@ %%WWWDIR%%/app/views/events/_event_merge_request.atom.haml %%WWWDIR%%/app/views/events/_event_note.atom.haml %%WWWDIR%%/app/views/events/_event_push.atom.haml +%%WWWDIR%%/app/views/events/_event_scope.html.haml %%WWWDIR%%/app/views/events/_events.html.haml %%WWWDIR%%/app/views/events/event/_common.html.haml %%WWWDIR%%/app/views/events/event/_created_project.html.haml @@ -985,6 +1010,7 @@ %%WWWDIR%%/app/views/import/fogbugz/new.html.haml %%WWWDIR%%/app/views/import/fogbugz/new_user_map.html.haml %%WWWDIR%%/app/views/import/fogbugz/status.html.haml +%%WWWDIR%%/app/views/import/github/new.html.haml %%WWWDIR%%/app/views/import/github/status.html.haml %%WWWDIR%%/app/views/import/gitlab/status.html.haml %%WWWDIR%%/app/views/import/gitlab_projects/new.html.haml @@ -1003,7 +1029,6 @@ %%WWWDIR%%/app/views/kaminari/gitlab/_prev_page.html.haml %%WWWDIR%%/app/views/layouts/_bootlint.haml %%WWWDIR%%/app/views/layouts/_broadcast.html.haml -%%WWWDIR%%/app/views/layouts/_collapse_button.html.haml %%WWWDIR%%/app/views/layouts/_flash.html.haml %%WWWDIR%%/app/views/layouts/_google_analytics.html.haml %%WWWDIR%%/app/views/layouts/_head.html.haml @@ -1015,9 +1040,6 @@ %%WWWDIR%%/app/views/layouts/_user_styles.html.haml %%WWWDIR%%/app/views/layouts/admin.html.haml %%WWWDIR%%/app/views/layouts/application.html.haml -%%WWWDIR%%/app/views/layouts/ci/_info.html.haml -%%WWWDIR%%/app/views/layouts/ci/_page.html.haml -%%WWWDIR%%/app/views/layouts/ci/notify.html.haml %%WWWDIR%%/app/views/layouts/dashboard.html.haml %%WWWDIR%%/app/views/layouts/devise.html.haml %%WWWDIR%%/app/views/layouts/devise_empty.html.haml @@ -1112,6 +1134,7 @@ %%WWWDIR%%/app/views/notify/repository_push_email.html.haml %%WWWDIR%%/app/views/notify/repository_push_email.text.haml %%WWWDIR%%/app/views/profiles/_event_table.html.haml +%%WWWDIR%%/app/views/profiles/_head.html.haml %%WWWDIR%%/app/views/profiles/accounts/show.html.haml %%WWWDIR%%/app/views/profiles/audit_log.html.haml %%WWWDIR%%/app/views/profiles/emails/index.html.haml @@ -1137,12 +1160,10 @@ %%WWWDIR%%/app/views/profiles/update_username.js.haml %%WWWDIR%%/app/views/projects/_activity.html.haml %%WWWDIR%%/app/views/projects/_bitbucket_import_modal.html.haml -%%WWWDIR%%/app/views/projects/_builds_settings.html.haml %%WWWDIR%%/app/views/projects/_commit_button.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 -%%WWWDIR%%/app/views/projects/_github_import_modal.html.haml %%WWWDIR%%/app/views/projects/_gitlab_import_modal.html.haml %%WWWDIR%%/app/views/projects/_home_panel.html.haml %%WWWDIR%%/app/views/projects/_last_commit.html.haml @@ -1155,7 +1176,6 @@ %%WWWDIR%%/app/views/projects/artifacts/_tree_directory.html.haml %%WWWDIR%%/app/views/projects/artifacts/_tree_file.html.haml %%WWWDIR%%/app/views/projects/artifacts/browse.html.haml -%%WWWDIR%%/app/views/projects/badges/index.html.haml %%WWWDIR%%/app/views/projects/blame/show.html.haml %%WWWDIR%%/app/views/projects/blob/_actions.html.haml %%WWWDIR%%/app/views/projects/blob/_blob.html.haml @@ -1204,6 +1224,7 @@ %%WWWDIR%%/app/views/projects/commits/show.atom.builder %%WWWDIR%%/app/views/projects/commits/show.html.haml %%WWWDIR%%/app/views/projects/compare/_form.html.haml +%%WWWDIR%%/app/views/projects/compare/_ref_dropdown.html.haml %%WWWDIR%%/app/views/projects/compare/index.html.haml %%WWWDIR%%/app/views/projects/compare/show.html.haml %%WWWDIR%%/app/views/projects/container_registry/_tag.html.haml @@ -1212,10 +1233,13 @@ %%WWWDIR%%/app/views/projects/deploy_keys/_form.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/index.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/new.html.haml +%%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/diffs/_content.html.haml %%WWWDIR%%/app/views/projects/diffs/_diffs.html.haml %%WWWDIR%%/app/views/projects/diffs/_file.html.haml +%%WWWDIR%%/app/views/projects/diffs/_file_header.html.haml %%WWWDIR%%/app/views/projects/diffs/_image.html.haml %%WWWDIR%%/app/views/projects/diffs/_line.html.haml %%WWWDIR%%/app/views/projects/diffs/_match_line.html.haml @@ -1345,6 +1369,7 @@ %%WWWDIR%%/app/views/projects/pipelines/index.html.haml %%WWWDIR%%/app/views/projects/pipelines/new.html.haml %%WWWDIR%%/app/views/projects/pipelines/show.html.haml +%%WWWDIR%%/app/views/projects/pipelines_settings/show.html.haml %%WWWDIR%%/app/views/projects/project_members/_group_members.html.haml %%WWWDIR%%/app/views/projects/project_members/_new_project_member.html.haml %%WWWDIR%%/app/views/projects/project_members/_shared_group_members.html.haml @@ -1353,7 +1378,11 @@ %%WWWDIR%%/app/views/projects/project_members/index.html.haml %%WWWDIR%%/app/views/projects/project_members/update.js.haml %%WWWDIR%%/app/views/projects/protected_branches/_branches_list.html.haml +%%WWWDIR%%/app/views/projects/protected_branches/_dropdown.html.haml +%%WWWDIR%%/app/views/projects/protected_branches/_matching_branch.html.haml +%%WWWDIR%%/app/views/projects/protected_branches/_protected_branch.html.haml %%WWWDIR%%/app/views/projects/protected_branches/index.html.haml +%%WWWDIR%%/app/views/projects/protected_branches/show.html.haml %%WWWDIR%%/app/views/projects/refs/logs_tree.js.haml %%WWWDIR%%/app/views/projects/releases/edit.html.haml %%WWWDIR%%/app/views/projects/remove_fork.js.haml @@ -1427,6 +1456,7 @@ %%WWWDIR%%/app/views/search/results/_snippet_title.html.haml %%WWWDIR%%/app/views/search/results/_wiki_blob.html.haml %%WWWDIR%%/app/views/search/show.html.haml +%%WWWDIR%%/app/views/shared/_allow_request_access.html.haml %%WWWDIR%%/app/views/shared/_choose_group_avatar_button.html.haml %%WWWDIR%%/app/views/shared/_clone_panel.html.haml %%WWWDIR%%/app/views/shared/_commit_message_container.html.haml @@ -1463,13 +1493,22 @@ %%WWWDIR%%/app/views/shared/icons/_commits.svg %%WWWDIR%%/app/views/shared/icons/_contributionanalytics.svg %%WWWDIR%%/app/views/shared/icons/_files.svg -%%WWWDIR%%/app/views/shared/icons/_group.svg -%%WWWDIR%%/app/views/shared/icons/_issues.svg +%%WWWDIR%%/app/views/shared/icons/_group.svg.erb +%%WWWDIR%%/app/views/shared/icons/_icon_commit.svg +%%WWWDIR%%/app/views/shared/icons/_icon_fork.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_cancel.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_failed.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_pending.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_running.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_success.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_warning.svg +%%WWWDIR%%/app/views/shared/icons/_icon_timer.svg +%%WWWDIR%%/app/views/shared/icons/_issues.svg.erb %%WWWDIR%%/app/views/shared/icons/_members.svg %%WWWDIR%%/app/views/shared/icons/_milestones.svg %%WWWDIR%%/app/views/shared/icons/_mr.svg %%WWWDIR%%/app/views/shared/icons/_pipelines.svg -%%WWWDIR%%/app/views/shared/icons/_project.svg +%%WWWDIR%%/app/views/shared/icons/_project.svg.erb %%WWWDIR%%/app/views/shared/icons/_wiki.svg %%WWWDIR%%/app/views/shared/issuable/_filter.html.haml %%WWWDIR%%/app/views/shared/issuable/_form.html.haml @@ -1533,9 +1572,9 @@ %%WWWDIR%%/app/workers/email_receiver_worker.rb %%WWWDIR%%/app/workers/emails_on_push_worker.rb *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610191422.u9JEMVST079876>