Merge branch 'ce-to-ee-2018-09-26' into 'master'

CE upstream - 2018-09-26 12:21 UTC

See merge request gitlab-org/gitlab-ee!7496

app/controllers/concerns/invalid_utf8_error_handler.rb

+# frozen_string_literal: true
+
 module InvalidUTF8ErrorHandler
   extend ActiveSupport::Concern
 

app/controllers/projects/application_controller.rb

+# frozen_string_literal: true
+
 class Projects::ApplicationController < ApplicationController
   prepend EE::Projects::ApplicationController
   include CookiesHelper

app/controllers/projects/artifacts_controller.rb

+# frozen_string_literal: true
+
 class Projects::ArtifactsController < Projects::ApplicationController
   include ExtractsPath
   include RendersBlob

app/controllers/projects/autocomplete_sources_controller.rb

+# frozen_string_literal: true
+
 class Projects::AutocompleteSourcesController < Projects::ApplicationController
   before_action :load_autocomplete_service, except: [:members]
 

app/controllers/projects/avatars_controller.rb

+# frozen_string_literal: true
+
 class Projects::AvatarsController < Projects::ApplicationController
   include SendsBlob
 

app/controllers/projects/badges_controller.rb

+# frozen_string_literal: true
+
 class Projects::BadgesController < Projects::ApplicationController
   layout 'project_settings'
   before_action :authorize_admin_project!, only: [:index]

app/controllers/projects/blame_controller.rb

+# frozen_string_literal: true
+
 # Controller for viewing a file's blame
 class Projects::BlameController < Projects::ApplicationController
   include ExtractsPath

app/controllers/projects/blob_controller.rb

+# frozen_string_literal: true
+
 # Controller for viewing a file's blame
 class Projects::BlobController < Projects::ApplicationController
   include ExtractsPath

app/controllers/projects/boards_controller.rb

+# frozen_string_literal: true
+
 class Projects::BoardsController < Projects::ApplicationController
   prepend EE::Boards::BoardsController
   include BoardsResponses

app/controllers/projects/branches_controller.rb

+# frozen_string_literal: true
+
 class Projects::BranchesController < Projects::ApplicationController
   include ActionView::Helpers::SanitizeHelper
   include SortingHelper

app/controllers/projects/build_artifacts_controller.rb

+# frozen_string_literal: true
+
 class Projects::BuildArtifactsController < Projects::ApplicationController
   include ExtractsPath
   include RendersBlob

app/controllers/projects/builds_controller.rb

+# frozen_string_literal: true
+
 class Projects::BuildsController < Projects::ApplicationController
   before_action :authorize_read_build!
 

app/controllers/projects/ci/lints_controller.rb

+# frozen_string_literal: true
+
 class Projects::Ci::LintsController < Projects::ApplicationController
   before_action :authorize_create_pipeline!
 

app/controllers/projects/clusters/applications_controller.rb

+# frozen_string_literal: true
+
 class Projects::Clusters::ApplicationsController < Projects::ApplicationController
   before_action :cluster
   before_action :application_class, only: [:create]

app/controllers/projects/clusters_controller.rb

+# frozen_string_literal: true
+
 class Projects::ClustersController < Projects::ApplicationController
   prepend EE::Projects::ClustersController
 

app/controllers/projects/commit_controller.rb

+# frozen_string_literal: true
+
 # Controller for a specific Commit
 #
 # Not to be confused with CommitsController, plural.

app/controllers/projects/commits_controller.rb

+# frozen_string_literal: true
+
 require "base64"
 
 class Projects::CommitsController < Projects::ApplicationController

app/controllers/projects/compare_controller.rb

+# frozen_string_literal: true
+
 require 'addressable/uri'
 
 class Projects::CompareController < Projects::ApplicationController

app/controllers/projects/cycle_analytics/events_controller.rb

+# frozen_string_literal: true
+
 module Projects
   module CycleAnalytics
     class EventsController < Projects::ApplicationController

app/controllers/projects/cycle_analytics_controller.rb

+# frozen_string_literal: true
+
 class Projects::CycleAnalyticsController < Projects::ApplicationController
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::TextHelper

app/controllers/projects/deploy_keys_controller.rb

+# frozen_string_literal: true
+
 class Projects::DeployKeysController < Projects::ApplicationController
   include RepositorySettingsRedirect
   respond_to :html

app/controllers/projects/deploy_tokens_controller.rb

+# frozen_string_literal: true
+
 class Projects::DeployTokensController < Projects::ApplicationController
   before_action :authorize_admin_project!
 

app/controllers/projects/deployments_controller.rb

+# frozen_string_literal: true
+
 class Projects::DeploymentsController < Projects::ApplicationController
   before_action :authorize_read_environment!
   before_action :authorize_read_deployment!

app/controllers/projects/discussions_controller.rb

+# frozen_string_literal: true
+
 class Projects::DiscussionsController < Projects::ApplicationController
   include NotesHelper
   include RendersNotes

app/controllers/projects/environments_controller.rb

+# frozen_string_literal: true
+
 class Projects::EnvironmentsController < Projects::ApplicationController
   layout 'project'
   before_action :authorize_read_environment!

app/controllers/projects/find_file_controller.rb

+# frozen_string_literal: true
+
 # Controller for viewing a repository's file structure
 class Projects::FindFileController < Projects::ApplicationController
   include ExtractsPath

app/controllers/projects/forks_controller.rb

+# frozen_string_literal: true
+
 class Projects::ForksController < Projects::ApplicationController
   include ContinueParams
 

app/controllers/projects/git_http_client_controller.rb

+# frozen_string_literal: true
+
 # This file should be identical in GitLab Community Edition and Enterprise Edition
 
 class Projects::GitHttpClientController < Projects::ApplicationController

app/controllers/projects/git_http_controller.rb

+# frozen_string_literal: true
+
 class Projects::GitHttpController < Projects::GitHttpClientController
   include WorkhorseRequest
   prepend ::EE::Projects::GitHttpController

app/controllers/projects/graphs_controller.rb

+# frozen_string_literal: true
+
 class Projects::GraphsController < Projects::ApplicationController
   include ExtractsPath
 

app/controllers/projects/group_links_controller.rb

+# frozen_string_literal: true
+
 class Projects::GroupLinksController < Projects::ApplicationController
   layout 'project_settings'
   before_action :authorize_admin_project!

app/controllers/projects/hook_logs_controller.rb

+# frozen_string_literal: true
+
 class Projects::HookLogsController < Projects::ApplicationController
   include HooksExecution
 

app/controllers/projects/hooks_controller.rb

+# frozen_string_literal: true
+
 class Projects::HooksController < Projects::ApplicationController
   include HooksExecution
 

app/controllers/projects/imports_controller.rb

+# frozen_string_literal: true
+
 class Projects::ImportsController < Projects::ApplicationController
   include ContinueParams
   include SafeMirrorParams

app/controllers/projects/issues_controller.rb

+# frozen_string_literal: true
+
 class Projects::IssuesController < Projects::ApplicationController
   include RendersNotes
   include ToggleSubscriptionAction

app/controllers/projects/jobs_controller.rb

+# frozen_string_literal: true
+
 class Projects::JobsController < Projects::ApplicationController
   include SendFileUpload
 

app/controllers/projects/labels_controller.rb

+# frozen_string_literal: true
+
 class Projects::LabelsController < Projects::ApplicationController
   include ToggleSubscriptionAction
 
@@ -138,12 +140,7 @@ class Projects::LabelsController < Projects::ApplicationController
   end
 
   def flash_notice_for(label, group)
-    notice = ''.html_safe
-    notice << label.title
-    notice << ' promoted to '
-    notice << view_context.link_to('<u>group label</u>'.html_safe, group_labels_path(group))
-    notice << '.'
-    notice
+    ''.html_safe + "#{label.title} promoted to " + view_context.link_to('<u>group label</u>'.html_safe, group_labels_path(group)) + '.'
   end
 
   protected

app/controllers/projects/lfs_api_controller.rb

+# frozen_string_literal: true
+
 class Projects::LfsApiController < Projects::GitHttpClientController
   include ApplicationSettingsHelper
   include ApplicationHelper

app/controllers/projects/lfs_locks_api_controller.rb

+# frozen_string_literal: true
+
 class Projects::LfsLocksApiController < Projects::GitHttpClientController
   include LfsRequest
 

app/controllers/projects/lfs_storage_controller.rb

+# frozen_string_literal: true
+
 class Projects::LfsStorageController < Projects::GitHttpClientController
   include LfsRequest
   include WorkhorseRequest

app/controllers/projects/mattermosts_controller.rb

+# frozen_string_literal: true
+
 class Projects::MattermostsController < Projects::ApplicationController
   include TriggersHelper
   include ActionView::Helpers::AssetUrlHelper

app/controllers/projects/merge_requests/application_controller.rb

+# frozen_string_literal: true
+
 class Projects::MergeRequests::ApplicationController < Projects::ApplicationController
   prepend ::EE::Projects::MergeRequests::ApplicationController
 

app/controllers/projects/merge_requests/conflicts_controller.rb

+# frozen_string_literal: true
+
 class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::ApplicationController
   include IssuableActions
 

app/controllers/projects/merge_requests/creations_controller.rb

+# frozen_string_literal: true
+
 class Projects::MergeRequests::CreationsController < Projects::MergeRequests::ApplicationController
   include DiffForPath
   include DiffHelper

app/controllers/projects/merge_requests/diffs_controller.rb

+# frozen_string_literal: true
+
 class Projects::MergeRequests::DiffsController < Projects::MergeRequests::ApplicationController
   include DiffForPath
   include DiffHelper

app/controllers/projects/merge_requests_controller.rb

+# frozen_string_literal: true
+
 class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController
   include ToggleSubscriptionAction
   include IssuableActions

app/controllers/projects/milestones_controller.rb

+# frozen_string_literal: true
+
 class Projects::MilestonesController < Projects::ApplicationController
   include Gitlab::Utils::StrongMemoize
   include MilestoneActions
@@ -91,12 +93,7 @@ class Projects::MilestonesController < Projects::ApplicationController
   end
 
   def flash_notice_for(milestone, group)
-    notice = ''.html_safe
-    notice << milestone.title
-    notice << ' promoted to '
-    notice << view_context.link_to('<u>group milestone</u>'.html_safe, group_milestone_path(group, milestone.iid))
-    notice << '.'
-    notice
+    ''.html_safe + "#{milestone.title} promoted to " + view_context.link_to('<u>group milestone</u>'.html_safe, group_milestone_path(group, milestone.iid)) + '.'
   end
 
   def destroy

app/controllers/projects/mirrors_controller.rb

+# frozen_string_literal: true
+
 class Projects::MirrorsController < Projects::ApplicationController
   include RepositorySettingsRedirect
 

app/controllers/projects/network_controller.rb

+# frozen_string_literal: true
+
 class Projects::NetworkController < Projects::ApplicationController
   include ExtractsPath
   include ApplicationHelper

app/controllers/projects/notes_controller.rb

+# frozen_string_literal: true
+
 class Projects::NotesController < Projects::ApplicationController
   include RendersNotes
   include NotesActions

app/controllers/projects/pages_controller.rb

+# frozen_string_literal: true
+
 class Projects::PagesController < Projects::ApplicationController
   layout 'project_settings'
 

app/controllers/projects/pages_domains_controller.rb

+# frozen_string_literal: true
+
 class Projects::PagesDomainsController < Projects::ApplicationController
   layout 'project_settings'
 

app/controllers/projects/pipeline_schedules_controller.rb

+# frozen_string_literal: true
+
 class Projects::PipelineSchedulesController < Projects::ApplicationController
   before_action :schedule, except: [:index, :new, :create]
 

app/controllers/projects/pipelines_controller.rb

+# frozen_string_literal: true
+
 class Projects::PipelinesController < Projects::ApplicationController
   prepend ::EE::Projects::PipelinesController
 

app/controllers/projects/pipelines_settings_controller.rb

+# frozen_string_literal: true
+
 class Projects::PipelinesSettingsController < Projects::ApplicationController
   before_action :authorize_admin_pipeline!
 

app/controllers/projects/project_members_controller.rb

+# frozen_string_literal: true
+
 class Projects::ProjectMembersController < Projects::ApplicationController
   include MembershipActions
   include MembersPresentation

app/controllers/projects/prometheus/metrics_controller.rb

+# frozen_string_literal: true
+
 module Projects
   module Prometheus
     class MetricsController < Projects::ApplicationController

app/controllers/projects/protected_branches_controller.rb

+# frozen_string_literal: true
+
 class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
   protected
 

app/controllers/projects/protected_refs_controller.rb

+# frozen_string_literal: true
+
 class Projects::ProtectedRefsController < Projects::ApplicationController
   include RepositorySettingsRedirect
 

app/controllers/projects/protected_tags_controller.rb

+# frozen_string_literal: true
+
 class Projects::ProtectedTagsController < Projects::ProtectedRefsController
   protected
 

app/controllers/projects/raw_controller.rb

+# frozen_string_literal: true
+
 # Controller for viewing a file's raw
 class Projects::RawController < Projects::ApplicationController
   include ExtractsPath

app/controllers/projects/refs_controller.rb

+# frozen_string_literal: true
+
 class Projects::RefsController < Projects::ApplicationController
   include ExtractsPath
   include TreeHelper

app/controllers/projects/registry/application_controller.rb

+# frozen_string_literal: true
+
 module Projects
   module Registry
     class ApplicationController < Projects::ApplicationController

app/controllers/projects/registry/repositories_controller.rb

+# frozen_string_literal: true
+
 module Projects
   module Registry
     class RepositoriesController < ::Projects::Registry::ApplicationController

app/controllers/projects/registry/tags_controller.rb

+# frozen_string_literal: true
+
 module Projects
   module Registry
     class TagsController < ::Projects::Registry::ApplicationController

app/controllers/projects/releases_controller.rb

+# frozen_string_literal: true
+
 class Projects::ReleasesController < Projects::ApplicationController
   # Authorize
   before_action :require_non_empty_project

app/controllers/projects/repositories_controller.rb

+# frozen_string_literal: true
+
 class Projects::RepositoriesController < Projects::ApplicationController
   include ExtractsPath
 

app/controllers/projects/runner_projects_controller.rb

+# frozen_string_literal: true
+
 class Projects::RunnerProjectsController < Projects::ApplicationController
   before_action :authorize_admin_build!
 

app/controllers/projects/runners_controller.rb

+# frozen_string_literal: true
+
 class Projects::RunnersController < Projects::ApplicationController
   before_action :authorize_admin_build!
   before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show]

app/controllers/projects/services_controller.rb

+# frozen_string_literal: true
+
 class Projects::ServicesController < Projects::ApplicationController
   include ServiceParams
 

app/controllers/projects/settings/ci_cd_controller.rb

+# frozen_string_literal: true
+
 module Projects
   module Settings
     class CiCdController < Projects::ApplicationController

app/controllers/projects/settings/integrations_controller.rb

+# frozen_string_literal: true
+
 module Projects
   module Settings
     class IntegrationsController < Projects::ApplicationController

app/controllers/projects/settings/repository_controller.rb

+# frozen_string_literal: true
+
 module Projects
   module Settings
     class RepositoryController < Projects::ApplicationController

app/controllers/projects/snippets_controller.rb

+# frozen_string_literal: true
+
 class Projects::SnippetsController < Projects::ApplicationController
   include RendersNotes
   include ToggleAwardEmoji

app/controllers/projects/tags_controller.rb

+# frozen_string_literal: true
+
 class Projects::TagsController < Projects::ApplicationController
   include SortingHelper
 

app/controllers/projects/templates_controller.rb

+# frozen_string_literal: true
+
 class Projects::TemplatesController < Projects::ApplicationController
   before_action :authenticate_user!, :get_template_class
 

app/controllers/projects/todos_controller.rb

+# frozen_string_literal: true
+
 class Projects::TodosController < Projects::ApplicationController
   include Gitlab::Utils::StrongMemoize
   include TodosActions

app/controllers/projects/tree_controller.rb

+# frozen_string_literal: true
+
 # Controller for viewing a repository's file structure
 class Projects::TreeController < Projects::ApplicationController
   include ExtractsPath

app/controllers/projects/triggers_controller.rb

+# frozen_string_literal: true
+
 class Projects::TriggersController < Projects::ApplicationController
   before_action :authorize_admin_build!
   before_action :authorize_manage_trigger!, except: [:index, :create]

app/controllers/projects/uploads_controller.rb

+# frozen_string_literal: true
+
 class Projects::UploadsController < Projects::ApplicationController
   include UploadsActions
   include WorkhorseRequest

app/controllers/projects/variables_controller.rb

+# frozen_string_literal: true
+
 class Projects::VariablesController < Projects::ApplicationController
   prepend ::EE::Projects::VariablesController
 

app/controllers/projects/wikis_controller.rb

+# frozen_string_literal: true
+
 class Projects::WikisController < Projects::ApplicationController
   include PreviewMarkdown
   include Gitlab::Utils::StrongMemoize

app/controllers/sherlock/application_controller.rb

+# frozen_string_literal: true
+
 module Sherlock
   class ApplicationController < ::ApplicationController
     before_action :find_transaction

app/controllers/sherlock/file_samples_controller.rb

+# frozen_string_literal: true
+
 module Sherlock
   class FileSamplesController < Sherlock::ApplicationController
     def show

app/controllers/sherlock/queries_controller.rb

+# frozen_string_literal: true
+
 module Sherlock
   class QueriesController < Sherlock::ApplicationController
     def show

app/controllers/sherlock/transactions_controller.rb

+# frozen_string_literal: true
+
 module Sherlock
   class TransactionsController < Sherlock::ApplicationController
     def index

app/controllers/snippets/notes_controller.rb

+# frozen_string_literal: true
+
 class Snippets::NotesController < ApplicationController
   include NotesActions
   include ToggleAwardEmoji

app/controllers/users/terms_controller.rb

+# frozen_string_literal: true
+
 module Users
   class TermsController < ApplicationController
     include InternalRedirect

app/models/project.rb

@@ -115,7 +115,7 @@ class Project < ActiveRecord::Base
   after_create :ensure_storage_path_exists
   after_save :ensure_storage_path_exists, if: :namespace_id_changed?
 
-  acts_as_taggable
+  acts_as_ordered_taggable
 
   attr_accessor :old_path_with_namespace
   attr_accessor :template_name

app/views/projects/edit.html.haml

@@ -40,7 +40,7 @@
 
         .form-group
           = f.label :tag_list, "Tags", class: 'label-bold'
-          = f.text_field :tag_list, value: @project.tag_list.sort.join(', '), maxlength: 2000, class: "form-control"
+          = f.text_field :tag_list, value: @project.tag_list.join(', '), maxlength: 2000, class: "form-control"
           %p.form-text.text-muted Separate tags with commas.
         %fieldset.features
           %h5.prepend-top-0= _("Project avatar")

changelogs/unreleased/51839-remove-sorting-on-project-tags.yml

+---
+title: Preserve order of project tags list
+merge_request: 21897
+author:
+type: changed

changelogs/unreleased/frozen-string-app-controllers-much-more.yml

+---
+title: Enable even more frozen string in app/controllers
+merge_request:
+author: gfyoung
+type: performance

doc/administration/repository_checks.md

@@ -18,7 +18,8 @@ repositories and wiki repositories in order to detect data corruption.
 A project will be checked no more than once per month. If any projects
 fail their repository checks all GitLab administrators will receive an email
 notification of the situation. This notification is sent out once a week,
-by default, midnight at the start of Sunday.
+by default, midnight at the start of Sunday. Repositories with known check
+failures can be found at `/admin/projects?last_repository_check_failed=1`.
 
 ## Disabling periodic checks
 

doc/administration/uploads.md

@@ -18,7 +18,7 @@ below.
 >**Notes:**
 For historical reasons, uploads are stored into a base directory, which by default is `uploads/-/system`. It is strongly discouraged to change this configuration option on an existing GitLab installation.
 
-_The uploads are stored by default in `/var/opt/gitlab/gitlab-rails/public/uploads/-/system`._
+_The uploads are stored by default in `/var/opt/gitlab/gitlab-rails/uploads/-/system`._
 
 1. To change the storage path for example to `/mnt/storage/uploads`, edit
    `/etc/gitlab/gitlab.rb` and add the following line:

doc/user/project/deploy_tokens/index.md

@@ -51,7 +51,7 @@ To download a repository using a Deploy Token, you just need to:
 
 
 ```bash
-git clone http://<username>:<deploy_token>@gitlab.example.com/tanuki/awesome_project.git
+git clone https://<username>:<deploy_token>@gitlab.example.com/tanuki/awesome_project.git
 ```
 
 Just replace `<username>` and `<deploy_token>` with the proper values

spec/features/projects/settings/user_tags_project_spec.rb

@@ -9,8 +9,7 @@ describe 'Projects > Settings > User tags a project' do
     visit edit_project_path(project)
   end
 
-  context 'when a project is archived' do
-    it 'unarchives a project' do
+  it 'sets project tags' do
     fill_in 'Tags', with: 'tag1, tag2'
 
     page.within '.general-settings' do
@@ -19,5 +18,4 @@ describe 'Projects > Settings > User tags a project' do
 
     expect(find_field('Tags').value).to eq 'tag1, tag2'
   end
-  end
 end