From owner-svn-ports-head@freebsd.org Fri Feb 24 09:45:09 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9E9ACEB2FD; Fri, 24 Feb 2017 09:45:09 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B0CE1DF4; Fri, 24 Feb 2017 09:45:09 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1O9j8QW076577; Fri, 24 Feb 2017 09:45:08 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1O9j7gL076565; Fri, 24 Feb 2017 09:45:07 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201702240945.v1O9j7gL076565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Fri, 24 Feb 2017 09:45:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434703 - in head/www/gitlab: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2017 09:45:10 -0000 Author: tz Date: Fri Feb 24 09:45:07 2017 New Revision: 434703 URL: https://svnweb.freebsd.org/changeset/ports/434703 Log: www/gitlab: Update from 8.11.11 to 8.12.13 Changelog: https://github.com/gitlabhq/gitlabhq/blob/v8.12.13/CHANGELOG Deleted: head/www/gitlab/files/patch-6130 head/www/gitlab/files/patch-new-gitlab-git 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 Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/Makefile Fri Feb 24 09:45:07 2017 (r434703) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 8.11.11 +PORTVERSION= 8.12.13 DISTVERSIONPREFIX= v -PORTREVISION= 7 CATEGORIES= www devel MAINTAINER= tz@FreeBSD.org @@ -18,8 +17,8 @@ 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.4.0:devel/gitlab-shell\ - gitlab-workhorse>=0.7.11:www/gitlab-workhorse \ + gitlab-shell>=3.6.1:devel/gitlab-shell\ + gitlab-workhorse>=0.8.2:www/gitlab-workhorse \ redis>=2.8.23:databases/redis \ rubygem-rails4>=4.2.7.1:www/rubygem-rails4 \ rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \ @@ -35,7 +34,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \ rubygem-omniauth-bitbucket>=0.0.2:security/rubygem-omniauth-bitbucket \ rubygem-omniauth-cas3>=1.1.2:security/rubygem-omniauth-cas3 \ - rubygem-omniauth-facebook>=3.0.0:net/rubygem-omniauth-facebook \ + rubygem-omniauth-facebook>=4.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.4.1:net/rubygem-omniauth-google-oauth2 \ @@ -52,13 +51,13 @@ 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.5:devel/rubygem-gitlab_git \ + rubygem-gitlab_git>=10.6.6:devel/rubygem-gitlab_git \ rubygem-gitlab_omniauth-ldap>=1.2.1:net/rubygem-gitlab_omniauth-ldap \ - rubygem-gollum-lib>=4.2.0:www/rubygem-gollum-lib \ + rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \ 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.15.0:devel/rubygem-grape \ - rubygem-grape-entity>=0.4.2:devel/rubygem-grape-entity \ + rubygem-grape-entity>=0.6.0: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-hamlit>=2.6.1:www/rubygem-hamlit \ @@ -72,11 +71,10 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ 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.4:textproc/rubygem-github-markup \ + rubygem-gitlab-markup>=1.5.0:textproc/rubygem-gitlab-markup \ rubygem-redcarpet>=3.3.3:textproc/rubygem-redcarpet \ rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ rubygem-rdoc>=3.6:devel/rubygem-rdoc \ @@ -119,6 +117,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-ace-rails-ap>=4.1.0: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-oj>=2.17.4:devel/rubygem-oj \ rubygem-chronic>=0.10.2:devel/rubygem-chronic \ rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \ rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \ @@ -145,7 +144,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-newrelic-grape>=0:devel/rubygem-newrelic-grape \ rubygem-newrelic_rpm>=3.16:devel/rubygem-newrelic_rpm \ rubygem-octokit>=4.3.0:net/rubygem-octokit \ - rubygem-mail_room>=0.8:mail/rubygem-mail_room \ + rubygem-mail_room>=0.8.1:mail/rubygem-mail_room \ rubygem-email_reply_parser>=0.5.8:mail/rubygem-email_reply_parser \ rubygem-ruby-prof>=0.15.9:devel/rubygem-ruby-prof \ rubygem-activerecord-deprecated_finders>=1.0.3:devel/rubygem-activerecord-deprecated_finders \ Modified: head/www/gitlab/distinfo ============================================================================== --- head/www/gitlab/distinfo Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/distinfo Fri Feb 24 09:45:07 2017 (r434703) @@ -1,3 +1,3 @@ -TIMESTAMP = 1478697779 -SHA256 (gitlabhq-gitlabhq-v8.11.11_GH0.tar.gz) = e94fb3eea5718a8efd6c3d2b76452e05ba20dcce113932a02e64503fa597f29a -SIZE (gitlabhq-gitlabhq-v8.11.11_GH0.tar.gz) = 25704458 +TIMESTAMP = 1485945896 +SHA256 (gitlabhq-gitlabhq-v8.12.13_GH0.tar.gz) = 7495bce297e95e880e3f2881d92e8d5b84cacd84b60eb54de459844176ec6f4a +SIZE (gitlabhq-gitlabhq-v8.12.13_GH0.tar.gz) = 27115017 Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/files/patch-Gemfile Fri Feb 24 09:45:07 2017 (r434703) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2016-11-09 05:10:18 UTC +--- Gemfile.orig 2016-12-14 20:07:13 UTC +++ Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' @@ -27,12 +27,7 @@ # Authentication libraries gem 'devise', '~> 4.0' -@@ -26,20 +25,19 @@ gem 'omniauth-auth0', '~> 1.4.1' - gem 'omniauth-azure-oauth2', '~> 0.0.6' - gem 'omniauth-bitbucket', '~> 0.0.2' - gem 'omniauth-cas3', '~> 1.1.2' --gem 'omniauth-facebook', '~> 3.0.0' -+gem 'omniauth-facebook', '>= 3.0.0' +@@ -30,16 +29,15 @@ gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' @@ -53,7 +48,16 @@ gem 'akismet', '~> 2.0' # Two-factor authentication -@@ -66,21 +64,21 @@ gem 'gollum-lib', '~> 4.2', require: fal +@@ -53,7 +51,7 @@ gem 'browser', '~> 2.2' + + # Extracting information from a git repository + # Provide access to Gitlab::Git library +-gem 'gitlab_git', '~> 10.6.6' ++gem 'gitlab_git', '>= 10.6.6' + + # LDAP Auth + # GitLab fork with several improvements to original library. For full list of changes +@@ -66,10 +64,10 @@ gem 'gollum-lib', '~> 4.2', require: fal gem 'gollum-rugged_adapter', '~> 0.4.2', require: false # Language detection @@ -62,12 +66,11 @@ # API -gem 'grape', '~> 0.15.0' --gem 'grape-entity', '~> 0.4.2' +gem 'grape', '>= 0.15.0' -+gem 'grape-entity', '>= 0.4.2' + gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' - # Pagination +@@ -77,10 +75,10 @@ gem 'rack-cors', '~> 0.4.0', require: gem 'kaminari', '~> 0.17.0' # HAML @@ -80,10 +83,10 @@ # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' -@@ -107,25 +105,25 @@ gem 'seed-fu', '~> 2.3.5' +@@ -104,25 +102,25 @@ gem 'seed-fu', '~> 2.3.5' gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' - gem 'github-markup', '~> 1.4' + gem 'gitlab-markup', '~> 1.5.0' -gem 'redcarpet', '~> 3.3.3' +gem 'redcarpet', '>= 3.3.3' gem 'RedCloth', '~> 4.3.2' @@ -112,7 +115,7 @@ gem 'unicorn-worker-killer', '~> 0.4.2' end -@@ -144,7 +142,7 @@ gem 'sidekiq-cron', '~> 0.4.0' +@@ -141,7 +139,7 @@ gem 'sidekiq-cron', '~> 0.4.0' gem 'redis-namespace', '~> 1.5.2' # HTTP requests @@ -121,7 +124,7 @@ # Colored output to console gem 'rainbow', '~> 2.1.0' -@@ -173,10 +171,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0. +@@ -170,10 +168,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0. gem 'gemnasium-gitlab-service', '~> 0.2' # Slack integration @@ -134,7 +137,7 @@ # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' -@@ -188,17 +186,17 @@ gem 'd3_rails', '~> 3.5.0' +@@ -185,17 +183,17 @@ gem 'd3_rails', '~> 3.5.0' gem 'underscore-rails', '~> 1.8.0' # Sanitize user input @@ -155,7 +158,7 @@ # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -@@ -215,125 +213,42 @@ gem 'chronic_duration', '~> 0.10.6' +@@ -215,127 +213,42 @@ gem 'chronic_duration', '~> 0.10.6' gem 'sass-rails', '~> 5.0.0' gem 'coffee-rails', '~> 4.1.0' @@ -249,9 +252,10 @@ - gem 'spring-commands-spinach', '~> 1.1.0' - gem 'spring-commands-teaspoon', '~> 0.0.2' - -- gem 'rubocop', '~> 0.41.2', require: false +- gem 'rubocop', '~> 0.42.0', require: false - gem 'rubocop-rspec', '~> 1.5.0', require: false - gem 'scss_lint', '~> 0.47.0', require: false +- gem 'haml_lint', '~> 0.18.2', require: false - gem 'simplecov', '0.12.0', require: false - gem 'flog', '~> 4.3.2', require: false - gem 'flay', '~> 2.6.1', require: false @@ -270,6 +274,7 @@ - gem 'webmock', '~> 1.21.0' - gem 'test_after_commit', '~> 0.4.2' - gem 'sham_rack', '~> 1.3.6' +- gem 'timecop', '~> 0.8.0' -end - group :production do @@ -281,7 +286,7 @@ -gem 'octokit', '~> 4.3.0' +gem 'octokit', '>= 4.3.0' - gem 'mail_room', '~> 0.8' + gem 'mail_room', '~> 0.8.1' gem 'email_reply_parser', '~> 0.5.8' @@ -290,7 +295,7 @@ ## CI gem 'activerecord-session_store', '~> 1.0.0' -@@ -346,8 +261,10 @@ gem 'oauth2', '~> 1.2.0' +@@ -348,8 +261,10 @@ gem 'oauth2', '~> 1.2.0' gem 'paranoia', '~> 2.0' # Health check Modified: head/www/gitlab/files/patch-config_database.yml.postgresql ============================================================================== --- head/www/gitlab/files/patch-config_database.yml.postgresql Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/files/patch-config_database.yml.postgresql Fri Feb 24 09:45:07 2017 (r434703) @@ -1,4 +1,4 @@ ---- config/database.yml.postgresql.orig 2016-10-11 15:15:22 UTC +--- config/database.yml.postgresql.orig 2016-12-14 20:07:13 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 Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/files/patch-config_gitlab.yml.example Fri Feb 24 09:45:07 2017 (r434703) @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2016-10-11 15:15:22 UTC +--- config/gitlab.yml.example.orig 2016-12-14 20:07:13 UTC +++ config/gitlab.yml.example @@ -433,7 +433,7 @@ production: &base # Paths where repositories can be stored. Give the canonicalized absolute pathname. Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb ============================================================================== --- head/www/gitlab/files/patch-config_initializers_1__settings.rb Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/files/patch-config_initializers_1__settings.rb Fri Feb 24 09:45:07 2017 (r434703) @@ -1,4 +1,4 @@ ---- config/initializers/1_settings.rb.orig 2016-10-11 15:15:22 UTC +--- config/initializers/1_settings.rb.orig 2016-12-14 20:07:13 UTC +++ config/initializers/1_settings.rb @@ -189,12 +189,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 Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/files/patch-config_unicorn.rb.example Fri Feb 24 09:45:07 2017 (r434703) @@ -1,4 +1,4 @@ ---- config/unicorn.rb.example.orig 2016-10-11 15:15:22 UTC +--- config/unicorn.rb.example.orig 2016-12-14 20:07:13 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 Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/files/patch-lib_support_nginx_gitlab Fri Feb 24 09:45:07 2017 (r434703) @@ -1,4 +1,4 @@ ---- lib/support/nginx/gitlab.orig 2016-10-11 15:15:22 UTC +--- lib/support/nginx/gitlab.orig 2016-12-14 20:07:13 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 Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Fri Feb 24 09:45:07 2017 (r434703) @@ -1,4 +1,4 @@ ---- lib/support/nginx/gitlab-ssl.orig 2016-10-11 15:15:22 UTC +--- lib/support/nginx/gitlab-ssl.orig 2016-12-14 20:07:13 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 Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/pkg-message Fri Feb 24 09:45:07 2017 (r434703) @@ -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.10.x to 8.11.x, please follow the instructions in the guide at: +switched from 8.11.x to 8.12.x, please follow the instructions in the guide at: -https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.10-to-8.11-freebsd.md +https://github.com/t-zuehlsdorff/gitlabhq/blob/master/doc/update/8.11-to-8.12-freebsd.md Modified: head/www/gitlab/pkg-plist ============================================================================== --- head/www/gitlab/pkg-plist Fri Feb 24 09:43:48 2017 (r434702) +++ head/www/gitlab/pkg-plist Fri Feb 24 09:45:07 2017 (r434703) @@ -5,6 +5,10 @@ %%WWWDIR%%/.github/ISSUE_TEMPLATE.md %%WWWDIR%%/.github/PULL_REQUEST_TEMPLATE.md %%WWWDIR%%/.gitlab-ci.yml +%%WWWDIR%%/.gitlab/issue_templates/Bug.md +%%WWWDIR%%/.gitlab/issue_templates/Feature Proposal.md +%%WWWDIR%%/.gitlab/merge_request_templates/Documentation.md +%%WWWDIR%%/.haml-lint.yml %%WWWDIR%%/.mailmap %%WWWDIR%%/.pkgr.yml %%WWWDIR%%/.rspec @@ -64,7 +68,7 @@ %%WWWDIR%%/app/assets/images/gitlab_logo.png %%WWWDIR%%/app/assets/images/gitorious-logo-black.png %%WWWDIR%%/app/assets/images/gitorious-logo-blue.png -%%WWWDIR%%/app/assets/images/icon-link.png +%%WWWDIR%%/app/assets/images/icon_anchor.svg %%WWWDIR%%/app/assets/images/koding-logo.svg %%WWWDIR%%/app/assets/images/logo.svg %%WWWDIR%%/app/assets/images/logo_wordmark.svg @@ -84,6 +88,7 @@ %%WWWDIR%%/app/assets/images/touch-icon-iphone.png %%WWWDIR%%/app/assets/images/white-scheme-preview.png %%WWWDIR%%/app/assets/javascripts/LabelManager.js +%%WWWDIR%%/app/assets/javascripts/abuse_reports.js.es6 %%WWWDIR%%/app/assets/javascripts/activities.js %%WWWDIR%%/app/assets/javascripts/admin.js %%WWWDIR%%/app/assets/javascripts/api.js @@ -125,15 +130,17 @@ %%WWWDIR%%/app/assets/javascripts/broadcast_message.js %%WWWDIR%%/app/assets/javascripts/build.js %%WWWDIR%%/app/assets/javascripts/build_artifacts.js +%%WWWDIR%%/app/assets/javascripts/build_variables.js.es6 %%WWWDIR%%/app/assets/javascripts/commit.js %%WWWDIR%%/app/assets/javascripts/commit/file.js %%WWWDIR%%/app/assets/javascripts/commit/image-file.js %%WWWDIR%%/app/assets/javascripts/commits.js %%WWWDIR%%/app/assets/javascripts/compare.js -%%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js +%%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js.es6 %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js %%WWWDIR%%/app/assets/javascripts/copy_to_clipboard.js %%WWWDIR%%/app/assets/javascripts/create_label.js.es6 +%%WWWDIR%%/app/assets/javascripts/cycle-analytics.js.es6 %%WWWDIR%%/app/assets/javascripts/diff.js %%WWWDIR%%/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6 %%WWWDIR%%/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6 @@ -142,14 +149,13 @@ %%WWWDIR%%/app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6 %%WWWDIR%%/app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6 %%WWWDIR%%/app/assets/javascripts/diff_notes/mixins/discussion.js.es6 -%%WWWDIR%%/app/assets/javascripts/diff_notes/mixins/namespace.js.es6 %%WWWDIR%%/app/assets/javascripts/diff_notes/models/discussion.js.es6 %%WWWDIR%%/app/assets/javascripts/diff_notes/models/note.js.es6 %%WWWDIR%%/app/assets/javascripts/diff_notes/services/resolve.js.es6 %%WWWDIR%%/app/assets/javascripts/diff_notes/stores/comments.js.es6 %%WWWDIR%%/app/assets/javascripts/dispatcher.js %%WWWDIR%%/app/assets/javascripts/dropzone_input.js -%%WWWDIR%%/app/assets/javascripts/due_date_select.js +%%WWWDIR%%/app/assets/javascripts/due_date_select.js.es6 %%WWWDIR%%/app/assets/javascripts/extensions/array.js %%WWWDIR%%/app/assets/javascripts/extensions/jquery.js %%WWWDIR%%/app/assets/javascripts/files_comment_button.js @@ -166,7 +172,7 @@ %%WWWDIR%%/app/assets/javascripts/groups.js %%WWWDIR%%/app/assets/javascripts/groups_select.js %%WWWDIR%%/app/assets/javascripts/importer_status.js -%%WWWDIR%%/app/assets/javascripts/issuable.js +%%WWWDIR%%/app/assets/javascripts/issuable.js.es6 %%WWWDIR%%/app/assets/javascripts/issuable_context.js %%WWWDIR%%/app/assets/javascripts/issuable_form.js %%WWWDIR%%/app/assets/javascripts/issue.js @@ -183,7 +189,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/animate.js %%WWWDIR%%/app/assets/javascripts/lib/utils/common_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/datetime_utility.js -%%WWWDIR%%/app/assets/javascripts/lib/utils/emoji_aliases.js.coffee.erb +%%WWWDIR%%/app/assets/javascripts/lib/utils/emoji_aliases.js.erb %%WWWDIR%%/app/assets/javascripts/lib/utils/jquery.timeago.js %%WWWDIR%%/app/assets/javascripts/lib/utils/notify.js %%WWWDIR%%/app/assets/javascripts/lib/utils/text_utility.js @@ -240,9 +246,10 @@ %%WWWDIR%%/app/assets/javascripts/shortcuts_issuable.js %%WWWDIR%%/app/assets/javascripts/shortcuts_navigation.js %%WWWDIR%%/app/assets/javascripts/shortcuts_network.js -%%WWWDIR%%/app/assets/javascripts/sidebar.js +%%WWWDIR%%/app/assets/javascripts/sidebar.js.es6 %%WWWDIR%%/app/assets/javascripts/single_file_diff.js %%WWWDIR%%/app/assets/javascripts/snippet/snippet_bundle.js +%%WWWDIR%%/app/assets/javascripts/snippets_list.js.es6 %%WWWDIR%%/app/assets/javascripts/star.js %%WWWDIR%%/app/assets/javascripts/subscription.js %%WWWDIR%%/app/assets/javascripts/subscription_select.js @@ -255,7 +262,7 @@ %%WWWDIR%%/app/assets/javascripts/u2f/error.js %%WWWDIR%%/app/assets/javascripts/u2f/register.js %%WWWDIR%%/app/assets/javascripts/u2f/util.js -%%WWWDIR%%/app/assets/javascripts/user.js +%%WWWDIR%%/app/assets/javascripts/user.js.es6 %%WWWDIR%%/app/assets/javascripts/user_tabs.js %%WWWDIR%%/app/assets/javascripts/users/calendar.js %%WWWDIR%%/app/assets/javascripts/users/users_bundle.js @@ -287,6 +294,7 @@ %%WWWDIR%%/app/assets/stylesheets/framework/jquery.scss %%WWWDIR%%/app/assets/stylesheets/framework/layout.scss %%WWWDIR%%/app/assets/stylesheets/framework/lists.scss +%%WWWDIR%%/app/assets/stylesheets/framework/logo.scss %%WWWDIR%%/app/assets/stylesheets/framework/markdown_area.scss %%WWWDIR%%/app/assets/stylesheets/framework/mixins.scss %%WWWDIR%%/app/assets/stylesheets/framework/mobile.scss @@ -321,6 +329,7 @@ %%WWWDIR%%/app/assets/stylesheets/pages/commit.scss %%WWWDIR%%/app/assets/stylesheets/pages/commits.scss %%WWWDIR%%/app/assets/stylesheets/pages/confirmation.scss +%%WWWDIR%%/app/assets/stylesheets/pages/cycle_analytics.scss %%WWWDIR%%/app/assets/stylesheets/pages/dashboard.scss %%WWWDIR%%/app/assets/stylesheets/pages/detail_page.scss %%WWWDIR%%/app/assets/stylesheets/pages/diff.scss @@ -478,6 +487,7 @@ %%WWWDIR%%/app/controllers/projects/commits_controller.rb %%WWWDIR%%/app/controllers/projects/compare_controller.rb %%WWWDIR%%/app/controllers/projects/container_registry_controller.rb +%%WWWDIR%%/app/controllers/projects/cycle_analytics_controller.rb %%WWWDIR%%/app/controllers/projects/deploy_keys_controller.rb %%WWWDIR%%/app/controllers/projects/discussions_controller.rb %%WWWDIR%%/app/controllers/projects/environments_controller.rb @@ -546,6 +556,7 @@ %%WWWDIR%%/app/finders/pipelines_finder.rb %%WWWDIR%%/app/finders/projects_finder.rb %%WWWDIR%%/app/finders/snippets_finder.rb +%%WWWDIR%%/app/finders/tags_finder.rb %%WWWDIR%%/app/finders/todos_finder.rb %%WWWDIR%%/app/finders/trending_projects_finder.rb %%WWWDIR%%/app/finders/union_finder.rb @@ -554,6 +565,7 @@ %%WWWDIR%%/app/helpers/application_settings_helper.rb %%WWWDIR%%/app/helpers/auth_helper.rb %%WWWDIR%%/app/helpers/avatars_helper.rb +%%WWWDIR%%/app/helpers/award_emoji_helper.rb %%WWWDIR%%/app/helpers/blob_helper.rb %%WWWDIR%%/app/helpers/branches_helper.rb %%WWWDIR%%/app/helpers/broadcast_messages_helper.rb @@ -595,7 +607,9 @@ %%WWWDIR%%/app/helpers/runners_helper.rb %%WWWDIR%%/app/helpers/search_helper.rb %%WWWDIR%%/app/helpers/selects_helper.rb +%%WWWDIR%%/app/helpers/sentry_helper.rb %%WWWDIR%%/app/helpers/services_helper.rb +%%WWWDIR%%/app/helpers/sidekiq_helper.rb %%WWWDIR%%/app/helpers/snippets_helper.rb %%WWWDIR%%/app/helpers/sorting_helper.rb %%WWWDIR%%/app/helpers/submodule_helper.rb @@ -647,6 +661,7 @@ %%WWWDIR%%/app/models/concerns/case_sensitivity.rb %%WWWDIR%%/app/models/concerns/expirable.rb %%WWWDIR%%/app/models/concerns/faster_cache_keys.rb +%%WWWDIR%%/app/models/concerns/has_status.rb %%WWWDIR%%/app/models/concerns/importable.rb %%WWWDIR%%/app/models/concerns/internal_id.rb %%WWWDIR%%/app/models/concerns/issuable.rb @@ -654,15 +669,17 @@ %%WWWDIR%%/app/models/concerns/milestoneish.rb %%WWWDIR%%/app/models/concerns/note_on_diff.rb %%WWWDIR%%/app/models/concerns/participable.rb +%%WWWDIR%%/app/models/concerns/project_features_compatibility.rb %%WWWDIR%%/app/models/concerns/protected_branch_access.rb %%WWWDIR%%/app/models/concerns/referable.rb %%WWWDIR%%/app/models/concerns/sortable.rb %%WWWDIR%%/app/models/concerns/spammable.rb -%%WWWDIR%%/app/models/concerns/statuseable.rb %%WWWDIR%%/app/models/concerns/strip_attribute.rb %%WWWDIR%%/app/models/concerns/subscribable.rb %%WWWDIR%%/app/models/concerns/taskable.rb %%WWWDIR%%/app/models/concerns/token_authenticatable.rb +%%WWWDIR%%/app/models/cycle_analytics.rb +%%WWWDIR%%/app/models/cycle_analytics/summary.rb %%WWWDIR%%/app/models/deploy_key.rb %%WWWDIR%%/app/models/deploy_keys_project.rb %%WWWDIR%%/app/models/deployment.rb @@ -683,6 +700,7 @@ %%WWWDIR%%/app/models/hooks/web_hook.rb %%WWWDIR%%/app/models/identity.rb %%WWWDIR%%/app/models/issue.rb +%%WWWDIR%%/app/models/issue/metrics.rb %%WWWDIR%%/app/models/key.rb %%WWWDIR%%/app/models/label.rb %%WWWDIR%%/app/models/label_link.rb @@ -694,7 +712,9 @@ %%WWWDIR%%/app/models/members/group_member.rb %%WWWDIR%%/app/models/members/project_member.rb %%WWWDIR%%/app/models/merge_request.rb +%%WWWDIR%%/app/models/merge_request/metrics.rb %%WWWDIR%%/app/models/merge_request_diff.rb +%%WWWDIR%%/app/models/merge_requests_closing_issues.rb %%WWWDIR%%/app/models/milestone.rb %%WWWDIR%%/app/models/namespace.rb %%WWWDIR%%/app/models/network/commit.rb @@ -705,6 +725,7 @@ %%WWWDIR%%/app/models/personal_access_token.rb %%WWWDIR%%/app/models/personal_snippet.rb %%WWWDIR%%/app/models/project.rb +%%WWWDIR%%/app/models/project_feature.rb %%WWWDIR%%/app/models/project_group_link.rb %%WWWDIR%%/app/models/project_import_data.rb %%WWWDIR%%/app/models/project_services/asana_service.rb @@ -736,6 +757,7 @@ %%WWWDIR%%/app/models/project_services/slack_service/issue_message.rb %%WWWDIR%%/app/models/project_services/slack_service/merge_message.rb %%WWWDIR%%/app/models/project_services/slack_service/note_message.rb +%%WWWDIR%%/app/models/project_services/slack_service/pipeline_message.rb %%WWWDIR%%/app/models/project_services/slack_service/push_message.rb %%WWWDIR%%/app/models/project_services/slack_service/wiki_page_message.rb %%WWWDIR%%/app/models/project_services/teamcity_service.rb @@ -760,6 +782,26 @@ %%WWWDIR%%/app/models/user_agent_detail.rb %%WWWDIR%%/app/models/users_star_project.rb %%WWWDIR%%/app/models/wiki_page.rb +%%WWWDIR%%/app/policies/base_policy.rb +%%WWWDIR%%/app/policies/ci/build_policy.rb +%%WWWDIR%%/app/policies/ci/runner_policy.rb +%%WWWDIR%%/app/policies/commit_status_policy.rb +%%WWWDIR%%/app/policies/deployment_policy.rb +%%WWWDIR%%/app/policies/environment_policy.rb +%%WWWDIR%%/app/policies/external_issue_policy.rb +%%WWWDIR%%/app/policies/global_policy.rb +%%WWWDIR%%/app/policies/group_member_policy.rb +%%WWWDIR%%/app/policies/group_policy.rb +%%WWWDIR%%/app/policies/issuable_policy.rb +%%WWWDIR%%/app/policies/issue_policy.rb +%%WWWDIR%%/app/policies/merge_request_policy.rb +%%WWWDIR%%/app/policies/namespace_policy.rb +%%WWWDIR%%/app/policies/note_policy.rb +%%WWWDIR%%/app/policies/personal_snippet_policy.rb +%%WWWDIR%%/app/policies/project_member_policy.rb +%%WWWDIR%%/app/policies/project_policy.rb +%%WWWDIR%%/app/policies/project_snippet_policy.rb +%%WWWDIR%%/app/policies/user_policy.rb %%WWWDIR%%/app/services/akismet_service.rb %%WWWDIR%%/app/services/audit_event_service.rb %%WWWDIR%%/app/services/auth/container_registry_authentication_service.rb @@ -778,7 +820,6 @@ %%WWWDIR%%/app/services/ci/image_for_build_service.rb %%WWWDIR%%/app/services/ci/process_pipeline_service.rb %%WWWDIR%%/app/services/ci/register_build_service.rb -%%WWWDIR%%/app/services/ci/web_hook_service.rb %%WWWDIR%%/app/services/commits/change_service.rb %%WWWDIR%%/app/services/commits/cherry_pick_service.rb %%WWWDIR%%/app/services/commits/revert_service.rb @@ -807,9 +848,9 @@ %%WWWDIR%%/app/services/groups/update_service.rb %%WWWDIR%%/app/services/ham_service.rb %%WWWDIR%%/app/services/import_export_clean_up_service.rb +%%WWWDIR%%/app/services/issuable/bulk_update_service.rb %%WWWDIR%%/app/services/issuable_base_service.rb %%WWWDIR%%/app/services/issues/base_service.rb -%%WWWDIR%%/app/services/issues/bulk_update_service.rb %%WWWDIR%%/app/services/issues/close_service.rb %%WWWDIR%%/app/services/issues/create_service.rb %%WWWDIR%%/app/services/issues/move_service.rb @@ -914,7 +955,6 @@ %%WWWDIR%%/app/views/admin/broadcast_messages/edit.html.haml %%WWWDIR%%/app/views/admin/broadcast_messages/index.html.haml %%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 @@ -1067,6 +1107,7 @@ %%WWWDIR%%/app/views/explore/projects/trending.html.haml %%WWWDIR%%/app/views/explore/snippets/index.html.haml %%WWWDIR%%/app/views/groups/_activities.html.haml +%%WWWDIR%%/app/views/groups/_group_lfs_settings.html.haml %%WWWDIR%%/app/views/groups/_projects.html.haml %%WWWDIR%%/app/views/groups/_shared_projects.html.haml %%WWWDIR%%/app/views/groups/activity.html.haml @@ -1297,6 +1338,7 @@ %%WWWDIR%%/app/views/projects/branches/new.html.haml %%WWWDIR%%/app/views/projects/builds/_header.html.haml %%WWWDIR%%/app/views/projects/builds/_sidebar.html.haml +%%WWWDIR%%/app/views/projects/builds/_table.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 @@ -1314,6 +1356,8 @@ %%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/_pipeline_stage.html.haml +%%WWWDIR%%/app/views/projects/commit/_pipeline_status_group.html.haml %%WWWDIR%%/app/views/projects/commit/_pipelines_list.haml %%WWWDIR%%/app/views/projects/commit/branches.html.haml %%WWWDIR%%/app/views/projects/commit/builds.html.haml @@ -1332,6 +1376,7 @@ %%WWWDIR%%/app/views/projects/compare/show.html.haml %%WWWDIR%%/app/views/projects/container_registry/_tag.html.haml %%WWWDIR%%/app/views/projects/container_registry/index.html.haml +%%WWWDIR%%/app/views/projects/cycle_analytics/show.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 @@ -1430,6 +1475,7 @@ %%WWWDIR%%/app/views/projects/merge_requests/show/_mr_box.html.haml %%WWWDIR%%/app/views/projects/merge_requests/show/_mr_title.html.haml %%WWWDIR%%/app/views/projects/merge_requests/show/_pipelines.html.haml +%%WWWDIR%%/app/views/projects/merge_requests/show/_versions.html.haml %%WWWDIR%%/app/views/projects/merge_requests/update_branches.html.haml %%WWWDIR%%/app/views/projects/merge_requests/widget/_closed.html.haml %%WWWDIR%%/app/views/projects/merge_requests/widget/_heading.html.haml @@ -1494,7 +1540,6 @@ %%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 -%%WWWDIR%%/app/views/projects/repositories/_download_archive.html.haml %%WWWDIR%%/app/views/projects/repositories/_feed.html.haml %%WWWDIR%%/app/views/projects/runners/_form.html.haml %%WWWDIR%%/app/views/projects/runners/_runner.html.haml @@ -1513,7 +1558,6 @@ %%WWWDIR%%/app/views/projects/snippets/index.html.haml %%WWWDIR%%/app/views/projects/snippets/new.html.haml %%WWWDIR%%/app/views/projects/snippets/show.html.haml -%%WWWDIR%%/app/views/projects/tags/_download.html.haml %%WWWDIR%%/app/views/projects/tags/_tag.html.haml %%WWWDIR%%/app/views/projects/tags/destroy.js.haml %%WWWDIR%%/app/views/projects/tags/index.html.haml @@ -1565,6 +1609,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/sent_notifications/unsubscribe.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 @@ -1583,6 +1628,7 @@ %%WWWDIR%%/app/views/shared/_merge_requests.html.haml %%WWWDIR%%/app/views/shared/_milestone_expired.html.haml %%WWWDIR%%/app/views/shared/_milestones_filter.html.haml +%%WWWDIR%%/app/views/shared/_nav_scroll.html.haml %%WWWDIR%%/app/views/shared/_new_commit_form.html.haml %%WWWDIR%%/app/views/shared/_new_project_item_select.html.haml %%WWWDIR%%/app/views/shared/_no_password.html.haml @@ -1596,6 +1642,7 @@ %%WWWDIR%%/app/views/shared/_sort_dropdown.html.haml %%WWWDIR%%/app/views/shared/_visibility_level.html.haml %%WWWDIR%%/app/views/shared/_visibility_radios.html.haml +%%WWWDIR%%/app/views/shared/builds/_tabs.html.haml %%WWWDIR%%/app/views/shared/groups/_group.html.haml %%WWWDIR%%/app/views/shared/groups/_list.html.haml %%WWWDIR%%/app/views/shared/icons/_activity.svg @@ -1604,9 +1651,11 @@ %%WWWDIR%%/app/views/shared/icons/_files.svg %%WWWDIR%%/app/views/shared/icons/_group.svg.erb %%WWWDIR%%/app/views/shared/icons/_icon_commit.svg +%%WWWDIR%%/app/views/shared/icons/_icon_cycle_analytics_splash.svg %%WWWDIR%%/app/views/shared/icons/_icon_fork.svg %%WWWDIR%%/app/views/shared/icons/_icon_play.svg %%WWWDIR%%/app/views/shared/icons/_icon_status_cancel.svg +%%WWWDIR%%/app/views/shared/icons/_icon_status_created.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 @@ -1696,6 +1745,7 @@ %%WWWDIR%%/app/workers/project_export_worker.rb %%WWWDIR%%/app/workers/project_service_worker.rb %%WWWDIR%%/app/workers/project_web_hook_worker.rb +%%WWWDIR%%/app/workers/prune_old_events_worker.rb %%WWWDIR%%/app/workers/remove_expired_group_links_worker.rb %%WWWDIR%%/app/workers/remove_expired_members_worker.rb %%WWWDIR%%/app/workers/repository_archive_cache_worker.rb @@ -1724,7 +1774,12 @@ @(git,,544) %%WWWDIR%%/bin/teaspoon @(git,,544) %%WWWDIR%%/bin/upgrade.rb @(git,,544) %%WWWDIR%%/bin/web -%%WWWDIR%%/changelogs/unreleased/markdown-xss-fix-option-2-1.yml +%%WWWDIR%%/changelogs/archive.md +%%WWWDIR%%/changelogs/unreleased/24537-reenable-private-token-with-sudo.yml +%%WWWDIR%%/changelogs/unreleased/25482-fix-api-sudo.yml +%%WWWDIR%%/changelogs/unreleased/jej-23867-use-mr-finder-instead-of-access-check.yml +%%WWWDIR%%/changelogs/unreleased/jej-note-search-uses-finder.yml +%%WWWDIR%%/changelogs/unreleased/zj-upgrade-grape.yml %%WWWDIR%%/config.ru %%WWWDIR%%/config/application.rb %%WWWDIR%%/config/aws.yml.example @@ -1743,6 +1798,7 @@ %%WWWDIR%%/config/initializers/5_backend.rb %%WWWDIR%%/config/initializers/6_validations.rb %%WWWDIR%%/config/initializers/active_record_query_trace.rb +%%WWWDIR%%/config/initializers/ar_monkey_patch.rb %%WWWDIR%%/config/initializers/attr_encrypted_no_db_connection.rb %%WWWDIR%%/config/initializers/backtrace_silencers.rb %%WWWDIR%%/config/initializers/bullet.rb @@ -1757,6 +1813,7 @@ %%WWWDIR%%/config/initializers/disable_email_interceptor.rb %%WWWDIR%%/config/initializers/doorkeeper.rb %%WWWDIR%%/config/initializers/gitlab_shell_secret_token.rb +%%WWWDIR%%/config/initializers/gitlab_workhorse_secret.rb %%WWWDIR%%/config/initializers/go_get.rb %%WWWDIR%%/config/initializers/gollum.rb %%WWWDIR%%/config/initializers/hamlit.rb @@ -1806,9 +1863,10 @@ %%WWWDIR%%/db/fixtures/development/11_keys.rb %%WWWDIR%%/db/fixtures/development/12_snippets.rb %%WWWDIR%%/db/fixtures/development/13_comments.rb -%%WWWDIR%%/db/fixtures/development/14_builds.rb +%%WWWDIR%%/db/fixtures/development/14_pipelines.rb %%WWWDIR%%/db/fixtures/development/15_award_emoji.rb %%WWWDIR%%/db/fixtures/development/16_protected_branches.rb +%%WWWDIR%%/db/fixtures/development/17_cycle_analytics.rb %%WWWDIR%%/db/fixtures/production/001_admin.rb %%WWWDIR%%/db/fixtures/test/001_repo.rb %%WWWDIR%%/db/migrate/20121220064453_init_schema.rb @@ -2191,6 +2249,7 @@ %%WWWDIR%%/db/migrate/20160705055809_remove_developers_can_push_from_protected_branches.rb %%WWWDIR%%/db/migrate/20160705055813_remove_developers_can_merge_from_protected_branches.rb %%WWWDIR%%/db/migrate/20160705163108_remove_requesters_that_are_owners.rb +%%WWWDIR%%/db/migrate/20160707104333_add_lock_to_issuables.rb %%WWWDIR%%/db/migrate/20160712171823_remove_award_emojis_with_no_user.rb %%WWWDIR%%/db/migrate/20160713205315_add_domain_blacklist_to_application_settings.rb %%WWWDIR%%/db/migrate/20160715132507_add_user_id_to_pipeline.rb @@ -2205,6 +2264,8 @@ %%WWWDIR%%/db/migrate/20160722221922_nullify_blank_type_on_notes.rb %%WWWDIR%%/db/migrate/20160724205507_add_resolved_to_notes.rb %%WWWDIR%%/db/migrate/20160725083350_add_external_url_to_enviroments.rb +%%WWWDIR%%/db/migrate/20160725104020_merge_request_diff_remove_uniq.rb +%%WWWDIR%%/db/migrate/20160725104452_merge_request_diff_add_index.rb %%WWWDIR%%/db/migrate/20160727163552_create_user_agent_details.rb %%WWWDIR%%/db/migrate/20160727191041_create_boards.rb %%WWWDIR%%/db/migrate/20160727193336_create_lists.rb @@ -2217,6 +2278,8 @@ %%WWWDIR%%/db/migrate/20160803161903_add_unique_index_to_lists_label_id.rb %%WWWDIR%%/db/migrate/20160804150737_add_timestamps_to_members_again.rb %%WWWDIR%%/db/migrate/20160805041956_add_deleted_at_to_namespaces.rb +%%WWWDIR%%/db/migrate/20160808085531_add_token_to_build.rb +%%WWWDIR%%/db/migrate/20160808085602_add_index_for_build_token.rb %%WWWDIR%%/db/migrate/20160810102349_remove_ci_runner_trigram_indexes.rb %%WWWDIR%%/db/migrate/20160810142633_remove_redundant_indexes.rb %%WWWDIR%%/db/migrate/20160816161312_add_column_name_to_u2f_registrations.rb @@ -2225,10 +2288,25 @@ %%WWWDIR%%/db/migrate/20160818205718_add_expires_at_to_project_group_links.rb %%WWWDIR%%/db/migrate/20160819221631_add_index_to_note_discussion_id.rb %%WWWDIR%%/db/migrate/20160819221833_reset_diff_note_discussion_id_because_it_was_calculated_wrongly.rb +%%WWWDIR%%/db/migrate/20160823081327_change_merge_error_to_text.rb +%%WWWDIR%%/db/migrate/20160823213309_add_lfs_enabled_to_projects.rb +%%WWWDIR%%/db/migrate/20160824103857_drop_unused_ci_tables.rb +%%WWWDIR%%/db/migrate/20160824124900_add_table_issue_metrics.rb +%%WWWDIR%%/db/migrate/20160825052008_add_table_merge_request_metrics.rb +%%WWWDIR%%/db/migrate/20160827011312_ensure_lock_version_has_no_default.rb %%WWWDIR%%/db/migrate/20160830203109_add_confidential_issues_events_to_web_hooks.rb %%WWWDIR%%/db/migrate/20160830211132_add_confidential_issues_events_to_services.rb +%%WWWDIR%%/db/migrate/20160830232601_change_lock_version_not_null.rb +%%WWWDIR%%/db/migrate/20160831214002_create_project_features.rb +%%WWWDIR%%/db/migrate/20160831214543_migrate_project_features.rb +%%WWWDIR%%/db/migrate/20160831223750_remove_features_enabled_from_projects.rb %%WWWDIR%%/db/migrate/20160901141443_set_confidential_issues_events_on_webhooks.rb +%%WWWDIR%%/db/migrate/20160901213340_add_lfs_enabled_to_namespaces.rb %%WWWDIR%%/db/migrate/20160902122721_drop_gitorious_field_from_application_settings.rb +%%WWWDIR%%/db/migrate/20160907131111_add_environment_type_to_environments.rb +%%WWWDIR%%/db/migrate/20160913162434_remove_projects_pushes_since_gc.rb +%%WWWDIR%%/db/migrate/20160913212128_change_artifacts_size_column.rb +%%WWWDIR%%/db/migrate/20160915042921_create_merge_requests_closing_issues.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb @@ -2252,6 +2330,7 @@ %%WWWDIR%%/doc/administration/img/housekeeping_settings.png %%WWWDIR%%/doc/administration/img/repository_storages_admin_ui.png %%WWWDIR%%/doc/administration/integration/koding.md +%%WWWDIR%%/doc/administration/issue_closing_pattern.md %%WWWDIR%%/doc/administration/logs.md %%WWWDIR%%/doc/administration/raketasks/project_import_export.md %%WWWDIR%%/doc/administration/repository_checks.md @@ -2264,11 +2343,13 @@ %%WWWDIR%%/doc/api/access_requests.md %%WWWDIR%%/doc/api/award_emoji.md %%WWWDIR%%/doc/api/branches.md +%%WWWDIR%%/doc/api/broadcast_messages.md %%WWWDIR%%/doc/api/build_triggers.md %%WWWDIR%%/doc/api/build_variables.md %%WWWDIR%%/doc/api/builds.md %%WWWDIR%%/doc/api/ci/README.md %%WWWDIR%%/doc/api/ci/builds.md +%%WWWDIR%%/doc/api/ci/lint.md %%WWWDIR%%/doc/api/ci/runners.md %%WWWDIR%%/doc/api/commits.md %%WWWDIR%%/doc/api/deploy_key_multiple_projects.md @@ -2285,6 +2366,7 @@ %%WWWDIR%%/doc/api/milestones.md %%WWWDIR%%/doc/api/namespaces.md %%WWWDIR%%/doc/api/notes.md +%%WWWDIR%%/doc/api/notification_settings.md %%WWWDIR%%/doc/api/oauth2.md %%WWWDIR%%/doc/api/pipelines.md %%WWWDIR%%/doc/api/project_snippets.md @@ -2370,6 +2452,7 @@ %%WWWDIR%%/doc/development/gotchas.md %%WWWDIR%%/doc/development/instrumentation.md %%WWWDIR%%/doc/development/licensing.md +%%WWWDIR%%/doc/development/merge_request_performance_guidelines.md %%WWWDIR%%/doc/development/migration_style_guide.md %%WWWDIR%%/doc/development/newlines_styleguide.md %%WWWDIR%%/doc/development/omnibus.md @@ -2466,6 +2549,8 @@ %%WWWDIR%%/doc/integration/gmail_action_buttons_for_gitlab.md %%WWWDIR%%/doc/integration/google.md %%WWWDIR%%/doc/integration/img/akismet_settings.png +%%WWWDIR%%/doc/integration/img/bitbucket_oauth_keys.png +%%WWWDIR%%/doc/integration/img/bitbucket_oauth_settings_page.png %%WWWDIR%%/doc/integration/img/enabled-oauth-sign-in-sources.png %%WWWDIR%%/doc/integration/img/facebook_api_keys.png %%WWWDIR%%/doc/integration/img/facebook_app_settings.png @@ -2628,6 +2713,7 @@ %%WWWDIR%%/doc/update/8.0-to-8.1.md %%WWWDIR%%/doc/update/8.1-to-8.2.md %%WWWDIR%%/doc/update/8.10-to-8.11.md +%%WWWDIR%%/doc/update/8.11-to-8.12.md %%WWWDIR%%/doc/update/8.2-to-8.3.md %%WWWDIR%%/doc/update/8.3-to-8.4.md %%WWWDIR%%/doc/update/8.4-to-8.5.md @@ -2641,6 +2727,8 @@ %%WWWDIR%%/doc/update/patch_versions.md %%WWWDIR%%/doc/update/restore_after_failure.md %%WWWDIR%%/doc/update/upgrader.md +%%WWWDIR%%/doc/user/account/security.md +%%WWWDIR%%/doc/user/account/two_factor_authentication.md %%WWWDIR%%/doc/user/admin_area/img/admin_labels.png %%WWWDIR%%/doc/user/admin_area/labels.md %%WWWDIR%%/doc/user/admin_area/settings/continuous_integration.md @@ -2660,8 +2748,11 @@ %%WWWDIR%%/doc/user/project/builds/img/build_artifacts_browser_button.png %%WWWDIR%%/doc/user/project/builds/img/build_artifacts_builds_page.png %%WWWDIR%%/doc/user/project/builds/img/build_artifacts_pipelines_page.png +%%WWWDIR%%/doc/user/project/builds/img/build_latest_artifacts_browser.png +%%WWWDIR%%/doc/user/project/cycle_analytics.md %%WWWDIR%%/doc/user/project/description_templates.md %%WWWDIR%%/doc/user/project/highlighting.md +%%WWWDIR%%/doc/user/project/img/cycle_analytics_landing_page.png %%WWWDIR%%/doc/user/project/img/description_templates.png %%WWWDIR%%/doc/user/project/img/issue_board.png %%WWWDIR%%/doc/user/project/img/issue_board_add_list.png @@ -2703,17 +2794,62 @@ %%WWWDIR%%/doc/user/project/img/protected_branches_matches.png %%WWWDIR%%/doc/user/project/img/protected_branches_page.png %%WWWDIR%%/doc/user/project/issue_board.md +%%WWWDIR%%/doc/user/project/issues/automatic_issue_closing.md %%WWWDIR%%/doc/user/project/koding.md %%WWWDIR%%/doc/user/project/labels.md +%%WWWDIR%%/doc/user/project/merge_requests.md +%%WWWDIR%%/doc/user/project/merge_requests/authorization_for_merge_requests.md +%%WWWDIR%%/doc/user/project/merge_requests/cherry_pick_changes.md +%%WWWDIR%%/doc/user/project/merge_requests/img/cherry_pick_changes_commit.png +%%WWWDIR%%/doc/user/project/merge_requests/img/cherry_pick_changes_commit_modal.png +%%WWWDIR%%/doc/user/project/merge_requests/img/cherry_pick_changes_mr.png +%%WWWDIR%%/doc/user/project/merge_requests/img/cherry_pick_changes_mr_modal.png +%%WWWDIR%%/doc/user/project/merge_requests/img/commit_compare.png %%WWWDIR%%/doc/user/project/merge_requests/img/conflict_section.png %%WWWDIR%%/doc/user/project/merge_requests/img/discussion_view.png %%WWWDIR%%/doc/user/project/merge_requests/img/discussions_resolved.png +%%WWWDIR%%/doc/user/project/merge_requests/img/merge_request_diff.png %%WWWDIR%%/doc/user/project/merge_requests/img/merge_request_widget.png +%%WWWDIR%%/doc/user/project/merge_requests/img/merge_when_build_succeeds_enable.png +%%WWWDIR%%/doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_msg.png +%%WWWDIR%%/doc/user/project/merge_requests/img/merge_when_build_succeeds_only_if_succeeds_settings.png +%%WWWDIR%%/doc/user/project/merge_requests/img/merge_when_build_succeeds_status.png %%WWWDIR%%/doc/user/project/merge_requests/img/resolve_comment_button.png %%WWWDIR%%/doc/user/project/merge_requests/img/resolve_discussion_button.png +%%WWWDIR%%/doc/user/project/merge_requests/img/revert_changes_commit.png +%%WWWDIR%%/doc/user/project/merge_requests/img/revert_changes_commit_modal.png +%%WWWDIR%%/doc/user/project/merge_requests/img/revert_changes_mr.png +%%WWWDIR%%/doc/user/project/merge_requests/img/revert_changes_mr_modal.png +%%WWWDIR%%/doc/user/project/merge_requests/img/versions-compare.png +%%WWWDIR%%/doc/user/project/merge_requests/img/versions-dropdown.png +%%WWWDIR%%/doc/user/project/merge_requests/img/versions.png +%%WWWDIR%%/doc/user/project/merge_requests/img/wip_blocked_accept_button.png +%%WWWDIR%%/doc/user/project/merge_requests/img/wip_mark_as_wip.png +%%WWWDIR%%/doc/user/project/merge_requests/img/wip_unmark_as_wip.png %%WWWDIR%%/doc/user/project/merge_requests/merge_request_discussion_resolution.md +%%WWWDIR%%/doc/user/project/merge_requests/merge_when_build_succeeds.md %%WWWDIR%%/doc/user/project/merge_requests/resolve_conflicts.md +%%WWWDIR%%/doc/user/project/merge_requests/revert_changes.md +%%WWWDIR%%/doc/user/project/merge_requests/versions.md +%%WWWDIR%%/doc/user/project/merge_requests/work_in_progress_merge_requests.md +%%WWWDIR%%/doc/user/project/new_ci_build_permissions_model.md %%WWWDIR%%/doc/user/project/protected_branches.md +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_branch_dropdown.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_branch_page.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_directory_dialog.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_directory_dropdown.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_file_dropdown.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_file_editor.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_push_widget.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_tag_dropdown.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_new_tag_page.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_start_new_merge_request.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_template_dropdown_buttons.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_template_dropdown_first_file.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_template_dropdown_mit_license.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_upload_file_dialog.png +%%WWWDIR%%/doc/user/project/repository/img/web_editor_upload_file_dropdown.png +%%WWWDIR%%/doc/user/project/repository/web_editor.md %%WWWDIR%%/doc/user/project/settings/img/import_export_download_export.png %%WWWDIR%%/doc/user/project/settings/img/import_export_export_button.png %%WWWDIR%%/doc/user/project/settings/img/import_export_mail_link.png @@ -2778,37 +2914,17 @@ %%WWWDIR%%/doc/workflow/img/award_emoji_votes_least_popular.png %%WWWDIR%%/doc/workflow/img/award_emoji_votes_most_popular.png %%WWWDIR%%/doc/workflow/img/award_emoji_votes_sort_options.png -%%WWWDIR%%/doc/workflow/img/cherry_pick_changes_commit.png -%%WWWDIR%%/doc/workflow/img/cherry_pick_changes_commit_modal.png -%%WWWDIR%%/doc/workflow/img/cherry_pick_changes_mr.png -%%WWWDIR%%/doc/workflow/img/cherry_pick_changes_mr_modal.png %%WWWDIR%%/doc/workflow/img/file_finder_find_button.png %%WWWDIR%%/doc/workflow/img/file_finder_find_file.png %%WWWDIR%%/doc/workflow/img/forking_workflow_choose_namespace.png %%WWWDIR%%/doc/workflow/img/forking_workflow_fork_button.png %%WWWDIR%%/doc/workflow/img/forking_workflow_path_taken_error.png %%WWWDIR%%/doc/workflow/img/new_branch_from_issue.png -%%WWWDIR%%/doc/workflow/img/revert_changes_commit.png -%%WWWDIR%%/doc/workflow/img/revert_changes_commit_modal.png -%%WWWDIR%%/doc/workflow/img/revert_changes_mr.png -%%WWWDIR%%/doc/workflow/img/revert_changes_mr_modal.png %%WWWDIR%%/doc/workflow/img/todo_list_item.png %%WWWDIR%%/doc/workflow/img/todos_add_todo_sidebar.png %%WWWDIR%%/doc/workflow/img/todos_icon.png %%WWWDIR%%/doc/workflow/img/todos_index.png %%WWWDIR%%/doc/workflow/img/todos_mark_done_sidebar.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_branch_dropdown.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_branch_page.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_directory_dialog.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_directory_dropdown.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_file_dropdown.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_file_editor.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_push_widget.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_tag_dropdown.png -%%WWWDIR%%/doc/workflow/img/web_editor_new_tag_page.png -%%WWWDIR%%/doc/workflow/img/web_editor_start_new_merge_request.png -%%WWWDIR%%/doc/workflow/img/web_editor_upload_file_dialog.png -%%WWWDIR%%/doc/workflow/img/web_editor_upload_file_dropdown.png %%WWWDIR%%/doc/workflow/importing/README.md %%WWWDIR%%/doc/workflow/importing/bitbucket_importer/bitbucket_import_grant_access.png %%WWWDIR%%/doc/workflow/importing/bitbucket_importer/bitbucket_import_new_project.png @@ -2823,6 +2939,7 @@ %%WWWDIR%%/doc/workflow/importing/gitlab_importer/new_project_page.png %%WWWDIR%%/doc/workflow/importing/img/import_projects_from_github_importer.png %%WWWDIR%%/doc/workflow/importing/img/import_projects_from_github_new_project_page.png +%%WWWDIR%%/doc/workflow/importing/img/import_projects_from_github_select_auth_method.png %%WWWDIR%%/doc/workflow/importing/import_projects_from_bitbucket.md %%WWWDIR%%/doc/workflow/importing/import_projects_from_fogbugz.md %%WWWDIR%%/doc/workflow/importing/import_projects_from_github.md @@ -2834,13 +2951,7 @@ %%WWWDIR%%/doc/workflow/merge_commits.png %%WWWDIR%%/doc/workflow/merge_request.png %%WWWDIR%%/doc/workflow/merge_requests.md -%%WWWDIR%%/doc/workflow/merge_requests/commit_compare.png -%%WWWDIR%%/doc/workflow/merge_requests/merge_request_diff.png -%%WWWDIR%%/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png -%%WWWDIR%%/doc/workflow/merge_requests/only_allow_merge_if_build_succeeds.png %%WWWDIR%%/doc/workflow/merge_when_build_succeeds.md -%%WWWDIR%%/doc/workflow/merge_when_build_succeeds/enable.png -%%WWWDIR%%/doc/workflow/merge_when_build_succeeds/status.png %%WWWDIR%%/doc/workflow/messy_flow.png %%WWWDIR%%/doc/workflow/milestones.md %%WWWDIR%%/doc/workflow/milestones/form.png @@ -2866,9 +2977,6 @@ %%WWWDIR%%/doc/workflow/todos.md %%WWWDIR%%/doc/workflow/web_editor.md %%WWWDIR%%/doc/workflow/wip_merge_requests.md -%%WWWDIR%%/doc/workflow/wip_merge_requests/blocked_accept_button.png -%%WWWDIR%%/doc/workflow/wip_merge_requests/mark_as_wip.png -%%WWWDIR%%/doc/workflow/wip_merge_requests/unmark_as_wip.png %%WWWDIR%%/doc/workflow/workflow.md %%WWWDIR%%/doc_styleguide.md %%WWWDIR%%/docker-compose.yml @@ -3086,6 +3194,7 @@ %%WWWDIR%%/lib/api/api_guard.rb %%WWWDIR%%/lib/api/award_emoji.rb %%WWWDIR%%/lib/api/branches.rb +%%WWWDIR%%/lib/api/broadcast_messages.rb %%WWWDIR%%/lib/api/builds.rb %%WWWDIR%%/lib/api/commit_statuses.rb %%WWWDIR%%/lib/api/commits.rb @@ -3102,11 +3211,14 @@ %%WWWDIR%%/lib/api/keys.rb %%WWWDIR%%/lib/api/labels.rb %%WWWDIR%%/lib/api/license_templates.rb +%%WWWDIR%%/lib/api/lint.rb %%WWWDIR%%/lib/api/members.rb +%%WWWDIR%%/lib/api/merge_request_diffs.rb %%WWWDIR%%/lib/api/merge_requests.rb %%WWWDIR%%/lib/api/milestones.rb %%WWWDIR%%/lib/api/namespaces.rb %%WWWDIR%%/lib/api/notes.rb +%%WWWDIR%%/lib/api/notification_settings.rb %%WWWDIR%%/lib/api/pipelines.rb %%WWWDIR%%/lib/api/project_hooks.rb %%WWWDIR%%/lib/api/project_snippets.rb @@ -3210,6 +3322,7 @@ %%WWWDIR%%/lib/ci/api/triggers.rb %%WWWDIR%%/lib/ci/charts.rb %%WWWDIR%%/lib/ci/gitlab_ci_yaml_processor.rb +%%WWWDIR%%/lib/ci/mask_secret.rb %%WWWDIR%%/lib/ci/model.rb %%WWWDIR%%/lib/ci/version_info.rb %%WWWDIR%%/lib/container_registry/blob.rb @@ -3220,6 +3333,7 @@ %%WWWDIR%%/lib/container_registry/tag.rb %%WWWDIR%%/lib/disable_email_interceptor.rb %%WWWDIR%%/lib/event_filter.rb +%%WWWDIR%%/lib/expand_variables.rb %%WWWDIR%%/lib/extracts_path.rb *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***