Date: Wed, 10 Aug 2016 14:30:22 +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: r420031 - in head/www/gitlab: . files Message-ID: <201608101430.u7AEUMf7093621@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Wed Aug 10 14:30:22 2016 New Revision: 420031 URL: https://svnweb.freebsd.org/changeset/ports/420031 Log: www/gitlab: Update from 8.8.7 to 8.9.6 Changes: https://github.com/gitlabhq/gitlabhq/blob/v8.9.6/CHANGELOG Approved by: junovitch (mentor, implicit) 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 Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/Makefile Wed Aug 10 14:30:22 2016 (r420031) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 8.8.7 +PORTVERSION= 8.9.6 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -12,9 +12,12 @@ COMMENT= Web GUI for managing git reposi LICENSE= MIT BUILD_DEPENDS= gem:devel/ruby-gems + +# the rubygems of RUN_DEPENDS matches the order of the Gemfile +# which makes maintaining this long list much easier! RUN_DEPENDS= git>=2.7.4:devel/git \ - gitlab-shell>=2.7.0:devel/gitlab-shell\ - gitlab-workhorse>=0.7.1:www/gitlab-workhorse \ + gitlab-shell>=3.0.0:devel/gitlab-shell\ + gitlab-workhorse>=0.7.5:www/gitlab-workhorse \ redis>=2.8.23:databases/redis \ rubygem-rails4>=4.2.6:www/rubygem-rails4 \ rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \ @@ -22,9 +25,8 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-sprockets3>=3.6:devel/rubygem-sprockets3 \ rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \ rubygem-pg>=0.18.2:databases/rubygem-pg \ - rubygem-devise-rails4>=3.5.4:devel/rubygem-devise-rails4 \ + rubygem-devise-rails4>=4.0:devel/rubygem-devise-rails4 \ rubygem-doorkeeper>=3.1:security/rubygem-doorkeeper \ - rubygem-devise-async-rails4>=0.9.0:devel/rubygem-devise-async-rails4 \ rubygem-omniauth>=1.3.1:security/rubygem-omniauth \ rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \ @@ -40,13 +42,14 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \ rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \ rubygem-jwt>=1.0:www/rubygem-jwt \ - rubygem-recaptcha>=0:devel/rubygem-recaptcha \ + rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \ rubygem-akismet>=2.0:devel/rubygem-akismet \ - rubygem-devise-two-factor>=2.0.0:security/rubygem-devise-two-factor \ + rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \ rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ - rubygem-attr_encrypted>=1.3.4:security/rubygem-attr_encrypted \ - rubygem-browser>=1.0.0:www/rubygem-browser \ - rubygem-gitlab_git>=10.0:devel/rubygem-gitlab_git \ + rubygem-attr_encrypted>=3.0.0:security/rubygem-attr_encrypted \ + rubygem-u2f>=0.2.1:net/rubygem-u2f \ + rubygem-browser>=2.2:www/rubygem-browser \ + rubygem-gitlab_git>=10.2:devel/rubygem-gitlab_git \ rubygem-gitlab_omniauth-ldap>=1.2.1:net/rubygem-gitlab_omniauth-ldap \ rubygem-gollum-lib>=4.1.0:www/rubygem-gollum-lib \ rubygem-gollum-rugged_adapter>=0.4.2:www/rubygem-gollum-rugged_adapter \ @@ -54,11 +57,16 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-grape>=0.13.0:devel/rubygem-grape \ rubygem-grape-entity>=0.4.2:devel/rubygem-grape-entity \ rubygem-rack-cors>=0.4.0:www/rubygem-rack-cors \ - rubygem-kaminari-rails4>=0.16.3:www/rubygem-kaminari-rails4 \ + rubygem-kaminari-rails4>=0.17.0:www/rubygem-kaminari-rails4 \ rubygem-haml-rails-rails4>=0.9.0:www/rubygem-haml-rails-rails4 \ rubygem-carrierwave>=0.10.0:www/rubygem-carrierwave \ rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \ - rubygem-fog>=1.36:devel/rubygem-fog \ + rubygem-fog-aws>=0.9:net/rubygem-fog-aws \ + rubygem-fog-azure>=0.0:net/rubygem-fog-azure \ + rubygem-fog-core>=1.40:devel/rubygem-fog-core \ + rubygem-fog-local>=0.3:net/rubygem-fog-local \ + rubygem-fog-google>=0.3:net/rubygem-fog-google \ + rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \ rubygem-unf>=0.1.4:textproc/rubygem-unf \ rubygem-six>=0.2.0:security/rubygem-six \ rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \ @@ -66,18 +74,18 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-task_list>=1.0.2:www/rubygem-task_list \ rubygem-github-markup>=1.3.1:textproc/rubygem-github-markup \ rubygem-redcarpet>=3.3.3:textproc/rubygem-redcarpet \ - rubygem-redcloth>=4.2.9:www/rubygem-redcloth \ + rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ rubygem-rdoc>=3.6:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0:textproc/rubygem-creole \ rubygem-wikicloth>=0.8.1:textproc/rubygem-wikicloth \ rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \ - rubygem-rouge>=1.10.1:textproc/rubygem-rouge \ + rubygem-rouge>=1.11:textproc/rubygem-rouge \ rubygem-nokogiri>=1.6.7.2:textproc/rubygem-nokogiri \ rubygem-diffy>=3.0.3:textproc/rubygem-diffy \ rubygem-unicorn>=4.9.0:www/rubygem-unicorn \ rubygem-unicorn-worker-killer>=0.4.2:www/rubygem-unicorn-worker-killer \ - rubygem-state_machines-activerecord>=0.3.0:databases/rubygem-state_machines-activerecord \ + rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \ rubygem-after_commit_queue>=0:databases/rubygem-after_commit_queue \ rubygem-acts-as-taggable-on3>=3.4.0:www/rubygem-acts-as-taggable-on3 \ rubygem-sinatra>=1.4.4:www/rubygem-sinatra \ @@ -85,7 +93,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-sidekiq-cron>=0.4.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=0:databases/rubygem-redis-namespace \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ - rubygem-colorize>=0.7.0:devel/rubygem-colorize \ + rubygem-rainbow>=2.1.0:devel/rubygem-rainbow \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ rubygem-version_sorter>=2.0.0:textproc/rubygem-version_sorter \ rubygem-redis-rails>=4.0.0:www/rubygem-redis-rails \ @@ -99,7 +107,6 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-asana>=0.4.0:www/rubygem-asana \ rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \ rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \ - rubygem-cal-heatmap-rails-rails4>=3.6.0:www/rubygem-cal-heatmap-rails-rails4 \ rubygem-underscore-rails>=1.8.0:www/rubygem-underscore-rails \ rubygem-sanitize>=2.0:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ @@ -109,6 +116,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-ace-rails-ap>=4.0.2:www/rubygem-ace-rails-ap \ rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \ rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \ + rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \ rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \ rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \ rubygem-uglifier>=2.7.2:www/rubygem-uglifier \ @@ -116,13 +124,12 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-jquery-turbolinks>=2.1.0:www/rubygem-jquery-turbolinks \ rubygem-addressable>=2.3.8:www/rubygem-addressable \ rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \ - rubygem-font-awesome-rails-rails4>=4.2:devel/rubygem-font-awesome-rails-rails4 \ + rubygem-font-awesome-rails-rails4>=4.6.1:devel/rubygem-font-awesome-rails-rails4 \ rubygem-gitlab_emoji>=0.3:graphics/rubygem-gitlab_emoji \ rubygem-gon>=6.0.1:www/rubygem-gon \ rubygem-jquery-atwho-rails-rails4>=1.3.2:www/rubygem-jquery-atwho-rails-rails4 \ rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \ rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \ - rubygem-raphael-rails>=2.1.2:www/rubygem-raphael-rails \ rubygem-request_store>=1.3.0:devel/rubygem-request_store \ rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \ rubygem-virtus>=1.0.1:devel/rubygem-virtus \ @@ -135,10 +142,10 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-newrelic-grape>=0:devel/rubygem-newrelic-grape \ rubygem-newrelic_rpm>=3.14:devel/rubygem-newrelic_rpm \ rubygem-octokit>=4.3.0:net/rubygem-octokit \ - rubygem-mail_room>=0.7:mail/rubygem-mail_room \ + rubygem-mail_room>=0.8:mail/rubygem-mail_room \ rubygem-email_reply_parser>=0.5.8:mail/rubygem-email_reply_parser \ rubygem-activerecord-deprecated_finders>=1.0.3:devel/rubygem-activerecord-deprecated_finders \ - rubygem-activerecord-session_store>=0.1.0:databases/rubygem-activerecord-session_store \ + rubygem-activerecord-session_store>=1.0.0:databases/rubygem-activerecord-session_store \ rubygem-nested_form>=0.3.2:www/rubygem-nested_form \ rubygem-oauth2>=1.0.0:net/rubygem-oauth2 \ rubygem-paranoia>=2.0:databases/rubygem-paranoia \ Modified: head/www/gitlab/distinfo ============================================================================== --- head/www/gitlab/distinfo Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/distinfo Wed Aug 10 14:30:22 2016 (r420031) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467811812 -SHA256 (gitlabhq-gitlabhq-v8.8.7_GH0.tar.gz) = 42ecd49943c879006d6042583b2e55f31a8f4b11d04faf693e1b1fe594697e4d -SIZE (gitlabhq-gitlabhq-v8.8.7_GH0.tar.gz) = 18479391 +TIMESTAMP = 1468919497 +SHA256 (gitlabhq-gitlabhq-v8.9.6_GH0.tar.gz) = 1b357ed1157a2a20b647004f588b67d72416df805a385fa7b605905bafb26f55 +SIZE (gitlabhq-gitlabhq-v8.9.6_GH0.tar.gz) = 21555571 Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/files/patch-Gemfile Wed Aug 10 14:30:22 2016 (r420031) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2016-06-15 01:41:18 UTC +--- Gemfile.orig 2016-07-11 19:38:44 UTC +++ Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" @@ -8,7 +8,7 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with -@@ -8,19 +8,18 @@ gem 'responders', '~> 2.0' +@@ -8,13 +8,12 @@ gem 'responders', '~> 2.0' # Specify a sprockets version due to increased performance # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 @@ -24,14 +24,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries - gem 'devise', '~> 3.5.4' - gem 'doorkeeper', '~> 3.1' --gem 'devise-async', '~> 0.9.0' -+gem 'devise-async', '>= 0.9.0' - gem 'omniauth', '~> 1.3.1' - gem 'omniauth-auth0', '~> 1.4.1' - gem 'omniauth-azure-oauth2', '~> 0.0.6' -@@ -29,13 +28,12 @@ gem 'omniauth-cas3', '~> 1.1.2' +@@ -28,13 +27,12 @@ gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' @@ -47,22 +40,6 @@ gem 'jwt' # Spam and anti-bot protection -@@ -43,12 +41,12 @@ gem 'recaptcha', require: 'recaptcha/rai - gem 'akismet', '~> 2.0' - - # Two-factor authentication --gem 'devise-two-factor', '~> 2.0.0' -+gem 'devise-two-factor', '>= 2.0.0' - gem 'rqrcode-rails3', '~> 0.1.7' --gem 'attr_encrypted', '~> 1.3.4' -+gem 'attr_encrypted', '>= 1.3.4' - - # Browser detection --gem "browser", '~> 1.0.0' -+gem "browser", '>= 1.0.0' - - # Extracting information from a git repository - # Provide access to Gitlab::Git library @@ -61,15 +59,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', # Git Wiki @@ -83,7 +60,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination -@@ -79,13 +77,13 @@ gem "kaminari", "~> 0.16.3" +@@ -79,7 +77,7 @@ gem "kaminari", "~> 0.17.0" gem "haml-rails", '~> 0.9.0' # Files attachments @@ -92,21 +69,14 @@ # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' - - # for aws storage --gem "fog", "~> 1.36.0" -+gem "fog", ">= 1.36.0" - gem "unf", '~> 0.1.4' - - # Authorization -@@ -97,13 +95,13 @@ gem "seed-fu", '~> 2.3.5' +@@ -104,26 +102,26 @@ gem "seed-fu", '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' -gem 'github-markup', '~> 1.3.1' +gem 'github-markup', '>= 1.3.1' gem 'redcarpet', '~> 3.3.3' - gem 'RedCloth', '~> 4.2.9' + gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' +gem 'rdoc', '>= 3.6' gem 'org-ruby', '~> 0.9.12' @@ -114,9 +84,11 @@ -gem 'wikicloth', '0.8.1' +gem 'wikicloth', '>= 0.8.1' gem 'asciidoctor', '~> 1.5.2' - gem 'rouge', '~> 1.10.1' +-gem 'rouge', '~> 1.11' ++gem 'rouge', '>= 1.11' -@@ -112,16 +110,16 @@ gem 'rouge', '~> 1.10.1' + # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s + # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' # Diffs @@ -130,13 +102,7 @@ gem 'unicorn-worker-killer', '~> 0.4.2' end - # State machine --gem "state_machines-activerecord", '~> 0.3.0' -+gem "state_machines-activerecord", '>= 0.3.0' - # Run events after state machine commits - gem 'after_commit_queue' - -@@ -167,10 +165,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. +@@ -174,10 +172,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. gem "gemnasium-gitlab-service", "~> 0.2" # Slack integration @@ -149,7 +115,7 @@ # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' -@@ -185,17 +183,17 @@ gem 'cal-heatmap-rails', '~> 3.6.0' +@@ -189,17 +187,17 @@ gem 'd3_rails', '~> 3.5.0' gem "underscore-rails", "~> 1.8.0" # Sanitize user input @@ -170,7 +136,7 @@ # Ace editor gem 'ace-rails-ap', '~> 4.0.2' -@@ -208,11 +206,11 @@ gem 'charlock_holmes', '~> 0.7.3' +@@ -215,11 +213,11 @@ gem 'chronic_duration', '~> 0.10.6' gem "sass-rails", '~> 5.0.0' gem "coffee-rails", '~> 4.1.0' @@ -182,12 +148,12 @@ -gem 'addressable', '~> 2.3.8' +gem 'addressable', '>= 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' - gem 'font-awesome-rails', '~> 4.2' + gem 'font-awesome-rails', '~> 4.6.1' gem 'gitlab_emoji', '~> 0.3.0' -@@ -221,10 +219,10 @@ gem 'jquery-atwho-rails', '~> 1.3.2' +@@ -227,10 +225,10 @@ gem 'gon', '~> 6.0.1' + gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' - gem 'raphael-rails', '~> 2.1.2' -gem 'request_store', '~> 1.3.0' +gem 'request_store', '>= 1.3.0' gem 'select2-rails', '~> 3.5.9' @@ -197,7 +163,7 @@ gem 'base32', '~> 0.3.0' # Sentry integration -@@ -232,86 +230,6 @@ gem 'sentry-raven', '~> 0.15' +@@ -238,90 +236,6 @@ gem 'sentry-raven', '~> 0.15' gem 'premailer-rails', '~> 1.9.0' @@ -210,7 +176,7 @@ - -group :development do - gem "foreman" -- gem 'brakeman', '~> 3.2.0', require: false +- gem 'brakeman', '~> 3.3.0', require: false - - gem 'letter_opener_web', '~> 1.3.0' - gem 'quiet_assets', '~> 1.0.2' @@ -262,15 +228,19 @@ - gem 'spring-commands-spinach', '~> 1.1.0' - gem 'spring-commands-teaspoon', '~> 0.0.2' - -- gem 'rubocop', '~> 0.38.0', require: false +- gem 'rubocop', '~> 0.40.0', require: false +- gem 'rubocop-rspec', '~> 1.5.0', require: false - gem 'scss_lint', '~> 0.47.0', require: false -- gem 'coveralls', '~> 0.8.2', require: false +- gem 'coveralls', '~> 0.8.2', require: false - gem 'simplecov', '~> 0.11.0', require: false - gem 'flog', require: false - gem 'flay', require: false - gem 'bundler-audit', require: false - - gem 'benchmark-ips', require: false +- +- gem "license_finder", require: false +- gem 'knapsack' -end - -group :test do @@ -284,7 +254,7 @@ group :production do gem "gitlab_meta", '7.0' end -@@ -329,10 +247,12 @@ gem 'activerecord-session_store', '~> 0. +@@ -339,10 +253,12 @@ gem 'activerecord-session_store', '~> 1. gem "nested_form", '~> 0.3.2' # OAuth Modified: head/www/gitlab/files/patch-config_database.yml.postgresql ============================================================================== --- head/www/gitlab/files/patch-config_database.yml.postgresql Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/files/patch-config_database.yml.postgresql Wed Aug 10 14:30:22 2016 (r420031) @@ -1,4 +1,4 @@ ---- config/database.yml.postgresql.orig 2016-04-22 10:01:37 UTC +--- config/database.yml.postgresql.orig 2016-07-11 19:38:44 UTC +++ config/database.yml.postgresql @@ -6,7 +6,7 @@ production: encoding: unicode Modified: head/www/gitlab/files/patch-config_gitlab.yml.example ============================================================================== --- head/www/gitlab/files/patch-config_gitlab.yml.example Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/files/patch-config_gitlab.yml.example Wed Aug 10 14:30:22 2016 (r420031) @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2016-06-15 01:41:18 UTC +--- config/gitlab.yml.example.orig 2016-07-11 19:38:44 UTC +++ config/gitlab.yml.example -@@ -448,11 +448,11 @@ production: &base +@@ -451,11 +451,11 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -15,7 +15,7 @@ # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -469,7 +469,7 @@ production: &base +@@ -472,7 +472,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb ============================================================================== --- head/www/gitlab/files/patch-config_initializers_1__settings.rb Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/files/patch-config_initializers_1__settings.rb Wed Aug 10 14:30:22 2016 (r420031) @@ -1,4 +1,4 @@ ---- config/initializers/1_settings.rb.orig 2016-06-15 01:41:18 UTC +--- config/initializers/1_settings.rb.orig 2016-07-11 19:38:44 UTC +++ config/initializers/1_settings.rb @@ -191,12 +191,8 @@ Settings.gitlab['email_reply_to'] ||= EN Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url) Modified: head/www/gitlab/files/patch-config_unicorn.rb.example ============================================================================== --- head/www/gitlab/files/patch-config_unicorn.rb.example Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/files/patch-config_unicorn.rb.example Wed Aug 10 14:30:22 2016 (r420031) @@ -1,4 +1,4 @@ ---- config/unicorn.rb.example.orig 2016-04-22 10:01:37 UTC +--- config/unicorn.rb.example.orig 2016-07-11 19:38:44 UTC +++ config/unicorn.rb.example @@ -33,12 +33,12 @@ worker_processes 3 Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab ============================================================================== --- head/www/gitlab/files/patch-lib_support_nginx_gitlab Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/files/patch-lib_support_nginx_gitlab Wed Aug 10 14:30:22 2016 (r420031) @@ -1,4 +1,4 @@ ---- lib/support/nginx/gitlab.orig 2016-06-15 01:41:18 UTC +--- lib/support/nginx/gitlab.orig 2016-07-11 19:38:44 UTC +++ lib/support/nginx/gitlab @@ -17,7 +17,7 @@ ## See installation.md#using-https for additional HTTPS configuration details. Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl ============================================================================== --- head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Wed Aug 10 14:30:22 2016 (r420031) @@ -1,4 +1,4 @@ ---- lib/support/nginx/gitlab-ssl.orig 2016-06-15 01:41:18 UTC +--- lib/support/nginx/gitlab-ssl.orig 2016-07-11 19:38:44 UTC +++ lib/support/nginx/gitlab-ssl @@ -21,7 +21,7 @@ ## See installation.md#using-https for additional HTTPS configuration details. Modified: head/www/gitlab/pkg-message ============================================================================== --- head/www/gitlab/pkg-message Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/pkg-message Wed Aug 10 14:30:22 2016 (r420031) @@ -11,6 +11,6 @@ the instructions in the guide at: https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/freebsd_patch_versions.md If you just installed an major upgrade of GitLab, for example you -switched from 8.6.x to 8.7.x, please follow the instructions in the guide at: +switched from 8.8.x to 8.9.x, please follow the instructions in the guide at: -https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.6-to-8.7-freebsd.md +https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.8-to-8.9-freebsd.md Modified: head/www/gitlab/pkg-plist ============================================================================== --- head/www/gitlab/pkg-plist Wed Aug 10 14:25:16 2016 (r420030) +++ head/www/gitlab/pkg-plist Wed Aug 10 14:30:22 2016 (r420031) @@ -2,6 +2,8 @@ %%WWWDIR%%/.flayignore %%WWWDIR%%/.foreman %%WWWDIR%%/.gitattributes +%%WWWDIR%%/.github/ISSUE_TEMPLATE.md +%%WWWDIR%%/.github/PULL_REQUEST_TEMPLATE.md %%WWWDIR%%/.gitlab-ci.yml %%WWWDIR%%/.hound.yml %%WWWDIR%%/.pkgr.yml @@ -11,6 +13,7 @@ %%WWWDIR%%/.scss-lint.yml %%WWWDIR%%/.simplecov %%WWWDIR%%/.teatro.yml +%%WWWDIR%%/.vagrant_enabled %%WWWDIR%%/CHANGELOG %%WWWDIR%%/CONTRIBUTING.md %%WWWDIR%%/GITLAB_SHELL_VERSION @@ -72,6 +75,8 @@ %%WWWDIR%%/app/assets/images/images.png %%WWWDIR%%/app/assets/images/logo.svg %%WWWDIR%%/app/assets/images/logo_wordmark.svg +%%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 %%WWWDIR%%/app/assets/images/move.png %%WWWDIR%%/app/assets/images/msapplication-tile.png @@ -90,6 +95,7 @@ %%WWWDIR%%/app/assets/images/touch-icon-iphone.png %%WWWDIR%%/app/assets/images/trans_bg.gif %%WWWDIR%%/app/assets/images/white-scheme-preview.png +%%WWWDIR%%/app/assets/javascripts/LabelManager.js.coffee %%WWWDIR%%/app/assets/javascripts/activities.js.coffee %%WWWDIR%%/app/assets/javascripts/admin.js.coffee %%WWWDIR%%/app/assets/javascripts/api.js.coffee @@ -102,15 +108,17 @@ %%WWWDIR%%/app/assets/javascripts/behaviors/quick_submit.js.coffee %%WWWDIR%%/app/assets/javascripts/behaviors/requires_input.js.coffee %%WWWDIR%%/app/assets/javascripts/behaviors/toggler_behavior.coffee +%%WWWDIR%%/app/assets/javascripts/blob/blob_ci_yaml.js.coffee %%WWWDIR%%/app/assets/javascripts/blob/blob_file_dropzone.js.coffee %%WWWDIR%%/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee +%%WWWDIR%%/app/assets/javascripts/blob/blob_gitignore_selectors.js.coffee %%WWWDIR%%/app/assets/javascripts/blob/blob_license_selector.js.coffee +%%WWWDIR%%/app/assets/javascripts/blob/blob_license_selectors.js.coffee %%WWWDIR%%/app/assets/javascripts/blob/edit_blob.js.coffee -%%WWWDIR%%/app/assets/javascripts/branch-graph.js.coffee +%%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_artifacts.js.coffee -%%WWWDIR%%/app/assets/javascripts/calendar.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 @@ -132,6 +140,11 @@ %%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/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 +%%WWWDIR%%/app/assets/javascripts/graphs/stat_graph_contributors_util.js.coffee %%WWWDIR%%/app/assets/javascripts/group_avatar.js.coffee %%WWWDIR%%/app/assets/javascripts/groups.js.coffee %%WWWDIR%%/app/assets/javascripts/groups_select.js.coffee @@ -141,11 +154,14 @@ %%WWWDIR%%/app/assets/javascripts/issuable_form.js.coffee %%WWWDIR%%/app/assets/javascripts/issue.js.coffee %%WWWDIR%%/app/assets/javascripts/issue_status_select.js.coffee -%%WWWDIR%%/app/assets/javascripts/issues.js.coffee +%%WWWDIR%%/app/assets/javascripts/issues-bulk-assignment.js.coffee %%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 @@ -158,13 +174,18 @@ %%WWWDIR%%/app/assets/javascripts/merge_request.js.coffee %%WWWDIR%%/app/assets/javascripts/merge_request_tabs.js.coffee %%WWWDIR%%/app/assets/javascripts/merge_request_widget.js.coffee +%%WWWDIR%%/app/assets/javascripts/merged_buttons.js.coffee %%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.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/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/project.js.coffee @@ -182,6 +203,7 @@ %%WWWDIR%%/app/assets/javascripts/search.js.coffee %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js.coffee %%WWWDIR%%/app/assets/javascripts/shortcuts.js.coffee +%%WWWDIR%%/app/assets/javascripts/shortcuts_blob.coffee %%WWWDIR%%/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee %%WWWDIR%%/app/assets/javascripts/shortcuts_find_file.js.coffee %%WWWDIR%%/app/assets/javascripts/shortcuts_issuable.coffee @@ -189,16 +211,18 @@ %%WWWDIR%%/app/assets/javascripts/shortcuts_network.js.coffee %%WWWDIR%%/app/assets/javascripts/sidebar.js.coffee %%WWWDIR%%/app/assets/javascripts/star.js.coffee -%%WWWDIR%%/app/assets/javascripts/stat_graph.js.coffee -%%WWWDIR%%/app/assets/javascripts/stat_graph_contributors.js.coffee -%%WWWDIR%%/app/assets/javascripts/stat_graph_contributors_graph.js.coffee -%%WWWDIR%%/app/assets/javascripts/stat_graph_contributors_util.js.coffee %%WWWDIR%%/app/assets/javascripts/subscription.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/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_select.js.coffee %%WWWDIR%%/app/assets/javascripts/wikis.js.coffee %%WWWDIR%%/app/assets/javascripts/zen_mode.js.coffee @@ -207,6 +231,7 @@ %%WWWDIR%%/app/assets/stylesheets/framework.scss %%WWWDIR%%/app/assets/stylesheets/framework/animations.scss %%WWWDIR%%/app/assets/stylesheets/framework/avatar.scss +%%WWWDIR%%/app/assets/stylesheets/framework/blank.scss %%WWWDIR%%/app/assets/stylesheets/framework/blocks.scss %%WWWDIR%%/app/assets/stylesheets/framework/buttons.scss %%WWWDIR%%/app/assets/stylesheets/framework/calendar.scss @@ -248,6 +273,7 @@ %%WWWDIR%%/app/assets/stylesheets/highlight/solarized_dark.scss %%WWWDIR%%/app/assets/stylesheets/highlight/solarized_light.scss %%WWWDIR%%/app/assets/stylesheets/highlight/white.scss +%%WWWDIR%%/app/assets/stylesheets/mailers/devise.scss %%WWWDIR%%/app/assets/stylesheets/mailers/repository_push_email.scss %%WWWDIR%%/app/assets/stylesheets/notify.scss %%WWWDIR%%/app/assets/stylesheets/pages/admin.scss @@ -263,6 +289,7 @@ %%WWWDIR%%/app/assets/stylesheets/pages/diff.scss %%WWWDIR%%/app/assets/stylesheets/pages/editor.scss %%WWWDIR%%/app/assets/stylesheets/pages/emojis.scss +%%WWWDIR%%/app/assets/stylesheets/pages/environments.scss %%WWWDIR%%/app/assets/stylesheets/pages/errors.scss %%WWWDIR%%/app/assets/stylesheets/pages/events.scss %%WWWDIR%%/app/assets/stylesheets/pages/explore.scss @@ -335,7 +362,9 @@ %%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/toggle_award_emoji.rb %%WWWDIR%%/app/controllers/concerns/toggle_subscription_action.rb %%WWWDIR%%/app/controllers/confirmations_controller.rb %%WWWDIR%%/app/controllers/dashboard/application_controller.rb @@ -355,7 +384,6 @@ %%WWWDIR%%/app/controllers/groups/avatars_controller.rb %%WWWDIR%%/app/controllers/groups/group_members_controller.rb %%WWWDIR%%/app/controllers/groups/milestones_controller.rb -%%WWWDIR%%/app/controllers/groups/notification_settings_controller.rb %%WWWDIR%%/app/controllers/groups_controller.rb %%WWWDIR%%/app/controllers/health_check_controller.rb %%WWWDIR%%/app/controllers/help_controller.rb @@ -364,11 +392,13 @@ %%WWWDIR%%/app/controllers/import/fogbugz_controller.rb %%WWWDIR%%/app/controllers/import/github_controller.rb %%WWWDIR%%/app/controllers/import/gitlab_controller.rb +%%WWWDIR%%/app/controllers/import/gitlab_projects_controller.rb %%WWWDIR%%/app/controllers/import/gitorious_controller.rb %%WWWDIR%%/app/controllers/import/google_code_controller.rb %%WWWDIR%%/app/controllers/invites_controller.rb %%WWWDIR%%/app/controllers/jwt_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 %%WWWDIR%%/app/controllers/oauth/authorized_applications_controller.rb @@ -381,6 +411,7 @@ %%WWWDIR%%/app/controllers/profiles/keys_controller.rb %%WWWDIR%%/app/controllers/profiles/notifications_controller.rb %%WWWDIR%%/app/controllers/profiles/passwords_controller.rb +%%WWWDIR%%/app/controllers/profiles/personal_access_tokens_controller.rb %%WWWDIR%%/app/controllers/profiles/preferences_controller.rb %%WWWDIR%%/app/controllers/profiles/two_factor_auths_controller.rb %%WWWDIR%%/app/controllers/profiles_controller.rb @@ -397,8 +428,10 @@ %%WWWDIR%%/app/controllers/projects/compare_controller.rb %%WWWDIR%%/app/controllers/projects/container_registry_controller.rb %%WWWDIR%%/app/controllers/projects/deploy_keys_controller.rb +%%WWWDIR%%/app/controllers/projects/environments_controller.rb %%WWWDIR%%/app/controllers/projects/find_file_controller.rb %%WWWDIR%%/app/controllers/projects/forks_controller.rb +%%WWWDIR%%/app/controllers/projects/git_http_controller.rb %%WWWDIR%%/app/controllers/projects/graphs_controller.rb %%WWWDIR%%/app/controllers/projects/group_links_controller.rb %%WWWDIR%%/app/controllers/projects/hooks_controller.rb @@ -409,7 +442,6 @@ %%WWWDIR%%/app/controllers/projects/milestones_controller.rb %%WWWDIR%%/app/controllers/projects/network_controller.rb %%WWWDIR%%/app/controllers/projects/notes_controller.rb -%%WWWDIR%%/app/controllers/projects/notification_settings_controller.rb %%WWWDIR%%/app/controllers/projects/pipelines_controller.rb %%WWWDIR%%/app/controllers/projects/project_members_controller.rb %%WWWDIR%%/app/controllers/projects/protected_branches_controller.rb @@ -422,6 +454,7 @@ %%WWWDIR%%/app/controllers/projects/services_controller.rb %%WWWDIR%%/app/controllers/projects/snippets_controller.rb %%WWWDIR%%/app/controllers/projects/tags_controller.rb +%%WWWDIR%%/app/controllers/projects/todos_controller.rb %%WWWDIR%%/app/controllers/projects/tree_controller.rb %%WWWDIR%%/app/controllers/projects/triggers_controller.rb %%WWWDIR%%/app/controllers/projects/uploads_controller.rb @@ -485,7 +518,9 @@ %%WWWDIR%%/app/helpers/import_helper.rb %%WWWDIR%%/app/helpers/issuables_helper.rb %%WWWDIR%%/app/helpers/issues_helper.rb +%%WWWDIR%%/app/helpers/javascript_helper.rb %%WWWDIR%%/app/helpers/labels_helper.rb +%%WWWDIR%%/app/helpers/members_helper.rb %%WWWDIR%%/app/helpers/merge_requests_helper.rb %%WWWDIR%%/app/helpers/milestones_helper.rb %%WWWDIR%%/app/helpers/namespaces_helper.rb @@ -509,13 +544,14 @@ %%WWWDIR%%/app/helpers/triggers_helper.rb %%WWWDIR%%/app/helpers/version_check_helper.rb %%WWWDIR%%/app/helpers/visibility_level_helper.rb +%%WWWDIR%%/app/helpers/workhorse_helper.rb %%WWWDIR%%/app/mailers/abuse_report_mailer.rb %%WWWDIR%%/app/mailers/base_mailer.rb %%WWWDIR%%/app/mailers/devise_mailer.rb %%WWWDIR%%/app/mailers/email_rejection_mailer.rb %%WWWDIR%%/app/mailers/emails/builds.rb -%%WWWDIR%%/app/mailers/emails/groups.rb %%WWWDIR%%/app/mailers/emails/issues.rb +%%WWWDIR%%/app/mailers/emails/members.rb %%WWWDIR%%/app/mailers/emails/merge_requests.rb %%WWWDIR%%/app/mailers/emails/notes.rb %%WWWDIR%%/app/mailers/emails/profile.rb @@ -527,10 +563,11 @@ %%WWWDIR%%/app/models/appearance.rb %%WWWDIR%%/app/models/application_setting.rb %%WWWDIR%%/app/models/audit_event.rb +%%WWWDIR%%/app/models/award_emoji.rb %%WWWDIR%%/app/models/blob.rb %%WWWDIR%%/app/models/broadcast_message.rb %%WWWDIR%%/app/models/ci/build.rb -%%WWWDIR%%/app/models/ci/commit.rb +%%WWWDIR%%/app/models/ci/pipeline.rb %%WWWDIR%%/app/models/ci/runner.rb %%WWWDIR%%/app/models/ci/runner_project.rb %%WWWDIR%%/app/models/ci/trigger.rb @@ -539,7 +576,10 @@ %%WWWDIR%%/app/models/commit.rb %%WWWDIR%%/app/models/commit_range.rb %%WWWDIR%%/app/models/commit_status.rb +%%WWWDIR%%/app/models/concerns/access_requestable.rb +%%WWWDIR%%/app/models/concerns/awardable.rb %%WWWDIR%%/app/models/concerns/case_sensitivity.rb +%%WWWDIR%%/app/models/concerns/importable.rb %%WWWDIR%%/app/models/concerns/internal_id.rb %%WWWDIR%%/app/models/concerns/issuable.rb %%WWWDIR%%/app/models/concerns/mentionable.rb @@ -554,7 +594,9 @@ %%WWWDIR%%/app/models/concerns/token_authenticatable.rb %%WWWDIR%%/app/models/deploy_key.rb %%WWWDIR%%/app/models/deploy_keys_project.rb +%%WWWDIR%%/app/models/deployment.rb %%WWWDIR%%/app/models/email.rb +%%WWWDIR%%/app/models/environment.rb %%WWWDIR%%/app/models/event.rb %%WWWDIR%%/app/models/external_issue.rb %%WWWDIR%%/app/models/forked_project_link.rb @@ -568,7 +610,6 @@ %%WWWDIR%%/app/models/hooks/web_hook.rb %%WWWDIR%%/app/models/identity.rb %%WWWDIR%%/app/models/issue.rb -%%WWWDIR%%/app/models/jira_issue.rb %%WWWDIR%%/app/models/key.rb %%WWWDIR%%/app/models/label.rb %%WWWDIR%%/app/models/label_link.rb @@ -587,6 +628,7 @@ %%WWWDIR%%/app/models/note.rb %%WWWDIR%%/app/models/notification_setting.rb %%WWWDIR%%/app/models/oauth_access_token.rb +%%WWWDIR%%/app/models/personal_access_token.rb %%WWWDIR%%/app/models/personal_snippet.rb %%WWWDIR%%/app/models/project.rb %%WWWDIR%%/app/models/project_group_link.rb @@ -637,6 +679,7 @@ %%WWWDIR%%/app/models/subscription.rb %%WWWDIR%%/app/models/todo.rb %%WWWDIR%%/app/models/tree.rb +%%WWWDIR%%/app/models/u2f_registration.rb %%WWWDIR%%/app/models/user.rb %%WWWDIR%%/app/models/users_star_project.rb %%WWWDIR%%/app/models/wiki_page.rb @@ -655,6 +698,7 @@ %%WWWDIR%%/app/services/compare_service.rb %%WWWDIR%%/app/services/create_branch_service.rb %%WWWDIR%%/app/services/create_commit_builds_service.rb +%%WWWDIR%%/app/services/create_deployment_service.rb %%WWWDIR%%/app/services/create_release_service.rb %%WWWDIR%%/app/services/create_snippet_service.rb %%WWWDIR%%/app/services/create_spam_log_service.rb @@ -684,6 +728,7 @@ %%WWWDIR%%/app/services/issues/move_service.rb %%WWWDIR%%/app/services/issues/reopen_service.rb %%WWWDIR%%/app/services/issues/update_service.rb +%%WWWDIR%%/app/services/members/destroy_service.rb %%WWWDIR%%/app/services/merge_requests/add_todo_when_build_fails_service.rb %%WWWDIR%%/app/services/merge_requests/base_service.rb %%WWWDIR%%/app/services/merge_requests/build_service.rb @@ -713,6 +758,7 @@ %%WWWDIR%%/app/services/projects/download_service.rb %%WWWDIR%%/app/services/projects/fork_service.rb %%WWWDIR%%/app/services/projects/housekeeping_service.rb +%%WWWDIR%%/app/services/projects/import_export/export_service.rb %%WWWDIR%%/app/services/projects/import_service.rb %%WWWDIR%%/app/services/projects/participants_service.rb %%WWWDIR%%/app/services/projects/transfer_service.rb @@ -760,6 +806,7 @@ %%WWWDIR%%/app/views/admin/applications/index.html.haml %%WWWDIR%%/app/views/admin/applications/new.html.haml %%WWWDIR%%/app/views/admin/applications/show.html.haml +%%WWWDIR%%/app/views/admin/background_jobs/_head.html.haml %%WWWDIR%%/app/views/admin/background_jobs/show.html.haml %%WWWDIR%%/app/views/admin/broadcast_messages/_form.html.haml %%WWWDIR%%/app/views/admin/broadcast_messages/edit.html.haml @@ -767,6 +814,7 @@ %%WWWDIR%%/app/views/admin/broadcast_messages/preview.js.haml %%WWWDIR%%/app/views/admin/builds/_build.html.haml %%WWWDIR%%/app/views/admin/builds/index.html.haml +%%WWWDIR%%/app/views/admin/dashboard/_head.html.haml %%WWWDIR%%/app/views/admin/dashboard/index.html.haml %%WWWDIR%%/app/views/admin/deploy_keys/index.html.haml %%WWWDIR%%/app/views/admin/deploy_keys/new.html.haml @@ -813,6 +861,7 @@ %%WWWDIR%%/app/views/admin/users/new.html.haml %%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 @@ -842,9 +891,14 @@ %%WWWDIR%%/app/views/dashboard/todos/index.html.haml %%WWWDIR%%/app/views/devise/confirmations/almost_there.haml %%WWWDIR%%/app/views/devise/confirmations/new.html.haml -%%WWWDIR%%/app/views/devise/mailer/confirmation_instructions.html.erb -%%WWWDIR%%/app/views/devise/mailer/reset_password_instructions.html.erb +%%WWWDIR%%/app/views/devise/mailer/confirmation_instructions.html.haml +%%WWWDIR%%/app/views/devise/mailer/confirmation_instructions.text.erb +%%WWWDIR%%/app/views/devise/mailer/password_change.html.haml +%%WWWDIR%%/app/views/devise/mailer/password_change.text.erb +%%WWWDIR%%/app/views/devise/mailer/reset_password_instructions.html.haml +%%WWWDIR%%/app/views/devise/mailer/reset_password_instructions.text.erb %%WWWDIR%%/app/views/devise/mailer/unlock_instructions.html.haml +%%WWWDIR%%/app/views/devise/mailer/unlock_instructions.text.erb %%WWWDIR%%/app/views/devise/passwords/edit.html.haml %%WWWDIR%%/app/views/devise/passwords/new.html.haml %%WWWDIR%%/app/views/devise/registrations/edit.html.erb @@ -880,6 +934,7 @@ %%WWWDIR%%/app/views/errors/not_found.html.haml %%WWWDIR%%/app/views/errors/omniauth_error.html.haml %%WWWDIR%%/app/views/events/_commit.html.haml +%%WWWDIR%%/app/views/events/_event.atom.builder %%WWWDIR%%/app/views/events/_event.html.haml %%WWWDIR%%/app/views/events/_event_issue.atom.haml %%WWWDIR%%/app/views/events/_event_last_push.html.haml @@ -905,7 +960,6 @@ %%WWWDIR%%/app/views/groups/_shared_projects.html.haml %%WWWDIR%%/app/views/groups/activity.html.haml %%WWWDIR%%/app/views/groups/edit.html.haml -%%WWWDIR%%/app/views/groups/group_members/_group_member.html.haml %%WWWDIR%%/app/views/groups/group_members/_new_group_member.html.haml %%WWWDIR%%/app/views/groups/group_members/index.html.haml %%WWWDIR%%/app/views/groups/group_members/update.js.haml @@ -933,11 +987,13 @@ %%WWWDIR%%/app/views/import/fogbugz/status.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 %%WWWDIR%%/app/views/import/gitorious/status.html.haml %%WWWDIR%%/app/views/import/google_code/new.html.haml %%WWWDIR%%/app/views/import/google_code/new_user_map.html.haml %%WWWDIR%%/app/views/import/google_code/status.html.haml %%WWWDIR%%/app/views/invites/show.html.haml +%%WWWDIR%%/app/views/issues/_issue.atom.builder %%WWWDIR%%/app/views/kaminari/gitlab/_first_page.html.haml %%WWWDIR%%/app/views/kaminari/gitlab/_gap.html.haml %%WWWDIR%%/app/views/kaminari/gitlab/_last_page.html.haml @@ -965,6 +1021,7 @@ %%WWWDIR%%/app/views/layouts/dashboard.html.haml %%WWWDIR%%/app/views/layouts/devise.html.haml %%WWWDIR%%/app/views/layouts/devise_empty.html.haml +%%WWWDIR%%/app/views/layouts/devise_mailer.html.haml %%WWWDIR%%/app/views/layouts/errors.html.haml %%WWWDIR%%/app/views/layouts/explore.html.haml %%WWWDIR%%/app/views/layouts/group.html.haml @@ -973,6 +1030,7 @@ %%WWWDIR%%/app/views/layouts/header/_empty.html.haml %%WWWDIR%%/app/views/layouts/help.html.haml %%WWWDIR%%/app/views/layouts/nav/_admin.html.haml +%%WWWDIR%%/app/views/layouts/nav/_admin_settings.html.haml %%WWWDIR%%/app/views/layouts/nav/_dashboard.html.haml %%WWWDIR%%/app/views/layouts/nav/_explore.html.haml %%WWWDIR%%/app/views/layouts/nav/_group.html.haml @@ -999,18 +1057,22 @@ %%WWWDIR%%/app/views/notify/closed_issue_email.text.haml %%WWWDIR%%/app/views/notify/closed_merge_request_email.html.haml %%WWWDIR%%/app/views/notify/closed_merge_request_email.text.haml -%%WWWDIR%%/app/views/notify/group_access_granted_email.html.haml -%%WWWDIR%%/app/views/notify/group_access_granted_email.text.erb -%%WWWDIR%%/app/views/notify/group_invite_accepted_email.html.haml -%%WWWDIR%%/app/views/notify/group_invite_accepted_email.text.erb -%%WWWDIR%%/app/views/notify/group_invite_declined_email.html.haml -%%WWWDIR%%/app/views/notify/group_invite_declined_email.text.erb -%%WWWDIR%%/app/views/notify/group_member_invited_email.html.haml -%%WWWDIR%%/app/views/notify/group_member_invited_email.text.erb %%WWWDIR%%/app/views/notify/issue_moved_email.html.haml %%WWWDIR%%/app/views/notify/issue_moved_email.text.erb %%WWWDIR%%/app/views/notify/issue_status_changed_email.html.haml %%WWWDIR%%/app/views/notify/issue_status_changed_email.text.erb +%%WWWDIR%%/app/views/notify/member_access_denied_email.html.haml +%%WWWDIR%%/app/views/notify/member_access_denied_email.text.erb +%%WWWDIR%%/app/views/notify/member_access_granted_email.html.haml +%%WWWDIR%%/app/views/notify/member_access_granted_email.text.erb +%%WWWDIR%%/app/views/notify/member_access_requested_email.html.haml +%%WWWDIR%%/app/views/notify/member_access_requested_email.text.erb +%%WWWDIR%%/app/views/notify/member_invite_accepted_email.html.haml +%%WWWDIR%%/app/views/notify/member_invite_accepted_email.text.erb +%%WWWDIR%%/app/views/notify/member_invite_declined_email.html.haml +%%WWWDIR%%/app/views/notify/member_invite_declined_email.text.erb +%%WWWDIR%%/app/views/notify/member_invited_email.html.haml +%%WWWDIR%%/app/views/notify/member_invited_email.text.erb %%WWWDIR%%/app/views/notify/merge_request_status_email.html.haml %%WWWDIR%%/app/views/notify/merge_request_status_email.text.haml %%WWWDIR%%/app/views/notify/merged_merge_request_email.html.haml @@ -1033,16 +1095,12 @@ %%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/project_access_granted_email.html.haml -%%WWWDIR%%/app/views/notify/project_access_granted_email.text.erb -%%WWWDIR%%/app/views/notify/project_invite_accepted_email.html.haml -%%WWWDIR%%/app/views/notify/project_invite_accepted_email.text.erb -%%WWWDIR%%/app/views/notify/project_invite_declined_email.html.haml -%%WWWDIR%%/app/views/notify/project_invite_declined_email.text.erb -%%WWWDIR%%/app/views/notify/project_member_invited_email.html.haml -%%WWWDIR%%/app/views/notify/project_member_invited_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 %%WWWDIR%%/app/views/notify/project_was_moved_email.text.erb +%%WWWDIR%%/app/views/notify/project_was_not_exported_email.html.haml +%%WWWDIR%%/app/views/notify/project_was_not_exported_email.text.haml %%WWWDIR%%/app/views/notify/reassigned_issue_email.html.haml %%WWWDIR%%/app/views/notify/reassigned_issue_email.text.erb %%WWWDIR%%/app/views/notify/reassigned_merge_request_email.html.haml @@ -1068,13 +1126,14 @@ %%WWWDIR%%/app/views/profiles/notifications/show.html.haml %%WWWDIR%%/app/views/profiles/passwords/edit.html.haml %%WWWDIR%%/app/views/profiles/passwords/new.html.haml +%%WWWDIR%%/app/views/profiles/personal_access_tokens/index.html.haml %%WWWDIR%%/app/views/profiles/preferences/show.html.haml %%WWWDIR%%/app/views/profiles/preferences/update.js.erb %%WWWDIR%%/app/views/profiles/show.html.haml %%WWWDIR%%/app/views/profiles/two_factor_auths/_codes.html.haml %%WWWDIR%%/app/views/profiles/two_factor_auths/codes.html.haml %%WWWDIR%%/app/views/profiles/two_factor_auths/create.html.haml -%%WWWDIR%%/app/views/profiles/two_factor_auths/new.html.haml +%%WWWDIR%%/app/views/profiles/two_factor_auths/show.html.haml %%WWWDIR%%/app/views/profiles/update_username.js.haml %%WWWDIR%%/app/views/projects/_activity.html.haml %%WWWDIR%%/app/views/projects/_bitbucket_import_modal.html.haml @@ -1089,6 +1148,7 @@ %%WWWDIR%%/app/views/projects/_last_commit.html.haml %%WWWDIR%%/app/views/projects/_last_push.html.haml %%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/_zen.html.haml %%WWWDIR%%/app/views/projects/activity.html.haml @@ -1101,7 +1161,6 @@ %%WWWDIR%%/app/views/projects/blob/_blob.html.haml %%WWWDIR%%/app/views/projects/blob/_download.html.haml %%WWWDIR%%/app/views/projects/blob/_editor.html.haml -%%WWWDIR%%/app/views/projects/blob/_header_title.html.haml %%WWWDIR%%/app/views/projects/blob/_image.html.haml %%WWWDIR%%/app/views/projects/blob/_new_dir.html.haml %%WWWDIR%%/app/views/projects/blob/_remove.html.haml @@ -1114,46 +1173,47 @@ %%WWWDIR%%/app/views/projects/blob/show.html.haml %%WWWDIR%%/app/views/projects/branches/_branch.html.haml %%WWWDIR%%/app/views/projects/branches/_commit.html.haml -%%WWWDIR%%/app/views/projects/branches/destroy.js.haml %%WWWDIR%%/app/views/projects/branches/index.html.haml %%WWWDIR%%/app/views/projects/branches/new.html.haml -%%WWWDIR%%/app/views/projects/builds/_header_title.html.haml +%%WWWDIR%%/app/views/projects/builds/_header.html.haml +%%WWWDIR%%/app/views/projects/builds/_sidebar.html.haml +%%WWWDIR%%/app/views/projects/builds/_user.html.haml %%WWWDIR%%/app/views/projects/builds/index.html.haml %%WWWDIR%%/app/views/projects/builds/show.html.haml %%WWWDIR%%/app/views/projects/buttons/_download.html.haml %%WWWDIR%%/app/views/projects/buttons/_dropdown.html.haml %%WWWDIR%%/app/views/projects/buttons/_fork.html.haml -%%WWWDIR%%/app/views/projects/buttons/_notifications.html.haml %%WWWDIR%%/app/views/projects/buttons/_star.html.haml %%WWWDIR%%/app/views/projects/ci/builds/_build.html.haml -%%WWWDIR%%/app/views/projects/ci/commits/_commit.html.haml +%%WWWDIR%%/app/views/projects/ci/pipelines/_pipeline.html.haml %%WWWDIR%%/app/views/projects/commit/_builds.html.haml %%WWWDIR%%/app/views/projects/commit/_change.html.haml -%%WWWDIR%%/app/views/projects/commit/_ci_commit.html.haml %%WWWDIR%%/app/views/projects/commit/_ci_menu.html.haml %%WWWDIR%%/app/views/projects/commit/_ci_stage.html.haml %%WWWDIR%%/app/views/projects/commit/_commit_box.html.haml +%%WWWDIR%%/app/views/projects/commit/_pipeline.html.haml %%WWWDIR%%/app/views/projects/commit/branches.html.haml %%WWWDIR%%/app/views/projects/commit/builds.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 %%WWWDIR%%/app/views/projects/commits/_commit_list.html.haml %%WWWDIR%%/app/views/projects/commits/_commits.html.haml %%WWWDIR%%/app/views/projects/commits/_head.html.haml -%%WWWDIR%%/app/views/projects/commits/_header_title.html.haml %%WWWDIR%%/app/views/projects/commits/_inline_commit.html.haml %%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/index.html.haml %%WWWDIR%%/app/views/projects/compare/show.html.haml -%%WWWDIR%%/app/views/projects/container_registry/_header_title.html.haml %%WWWDIR%%/app/views/projects/container_registry/_tag.html.haml %%WWWDIR%%/app/views/projects/container_registry/index.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/_deploy_key.html.haml %%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/_commit.html.haml +%%WWWDIR%%/app/views/projects/deployments/_deployment.html.haml %%WWWDIR%%/app/views/projects/diffs/_diffs.html.haml %%WWWDIR%%/app/views/projects/diffs/_file.html.haml %%WWWDIR%%/app/views/projects/diffs/_image.html.haml @@ -1166,6 +1226,12 @@ %%WWWDIR%%/app/views/projects/diffs/_warning.html.haml %%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/_form.html.haml +%%WWWDIR%%/app/views/projects/environments/_header_title.html.haml +%%WWWDIR%%/app/views/projects/environments/index.html.haml *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608101430.u7AEUMf7093621>