Commit 256f355b authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-26

parents ae2ca2f7 6c3c76af
# frozen_string_literal: true
module InvalidUTF8ErrorHandler
extend ActiveSupport::Concern
......
# frozen_string_literal: true
class Projects::ApplicationController < ApplicationController
prepend EE::Projects::ApplicationController
include CookiesHelper
......
# frozen_string_literal: true
class Projects::ArtifactsController < Projects::ApplicationController
include ExtractsPath
include RendersBlob
......
# frozen_string_literal: true
class Projects::AutocompleteSourcesController < Projects::ApplicationController
before_action :load_autocomplete_service, except: [:members]
......
# frozen_string_literal: true
class Projects::AvatarsController < Projects::ApplicationController
include SendsBlob
......
# frozen_string_literal: true
class Projects::BadgesController < Projects::ApplicationController
layout 'project_settings'
before_action :authorize_admin_project!, only: [:index]
......
# frozen_string_literal: true
# Controller for viewing a file's blame
class Projects::BlameController < Projects::ApplicationController
include ExtractsPath
......
# frozen_string_literal: true
# Controller for viewing a file's blame
class Projects::BlobController < Projects::ApplicationController
include ExtractsPath
......
# frozen_string_literal: true
class Projects::BoardsController < Projects::ApplicationController
prepend EE::Boards::BoardsController
include BoardsResponses
......
# frozen_string_literal: true
class Projects::BranchesController < Projects::ApplicationController
include ActionView::Helpers::SanitizeHelper
include SortingHelper
......
# frozen_string_literal: true
class Projects::BuildArtifactsController < Projects::ApplicationController
include ExtractsPath
include RendersBlob
......
# frozen_string_literal: true
class Projects::BuildsController < Projects::ApplicationController
before_action :authorize_read_build!
......
# frozen_string_literal: true
class Projects::Ci::LintsController < Projects::ApplicationController
before_action :authorize_create_pipeline!
......
# frozen_string_literal: true
class Projects::Clusters::ApplicationsController < Projects::ApplicationController
before_action :cluster
before_action :application_class, only: [:create]
......
# frozen_string_literal: true
class Projects::ClustersController < Projects::ApplicationController
prepend EE::Projects::ClustersController
......
# frozen_string_literal: true
# Controller for a specific Commit
#
# Not to be confused with CommitsController, plural.
......
# frozen_string_literal: true
require "base64"
class Projects::CommitsController < Projects::ApplicationController
......
# frozen_string_literal: true
require 'addressable/uri'
class Projects::CompareController < Projects::ApplicationController
......
# frozen_string_literal: true
module Projects
module CycleAnalytics
class EventsController < Projects::ApplicationController
......
# frozen_string_literal: true
class Projects::CycleAnalyticsController < Projects::ApplicationController
include ActionView::Helpers::DateHelper
include ActionView::Helpers::TextHelper
......
# frozen_string_literal: true
class Projects::DeployKeysController < Projects::ApplicationController
include RepositorySettingsRedirect
respond_to :html
......
# frozen_string_literal: true
class Projects::DeployTokensController < Projects::ApplicationController
before_action :authorize_admin_project!
......
# frozen_string_literal: true
class Projects::DeploymentsController < Projects::ApplicationController
before_action :authorize_read_environment!
before_action :authorize_read_deployment!
......
# frozen_string_literal: true
class Projects::DiscussionsController < Projects::ApplicationController
include NotesHelper
include RendersNotes
......
# frozen_string_literal: true
class Projects::EnvironmentsController < Projects::ApplicationController
layout 'project'
before_action :authorize_read_environment!
......
# frozen_string_literal: true
# Controller for viewing a repository's file structure
class Projects::FindFileController < Projects::ApplicationController
include ExtractsPath
......
# frozen_string_literal: true
class Projects::ForksController < Projects::ApplicationController
include ContinueParams
......
# frozen_string_literal: true
# This file should be identical in GitLab Community Edition and Enterprise Edition
class Projects::GitHttpClientController < Projects::ApplicationController
......
# frozen_string_literal: true
class Projects::GitHttpController < Projects::GitHttpClientController
include WorkhorseRequest
prepend ::EE::Projects::GitHttpController
......
# frozen_string_literal: true
class Projects::GraphsController < Projects::ApplicationController
include ExtractsPath
......
# frozen_string_literal: true
class Projects::GroupLinksController < Projects::ApplicationController
layout 'project_settings'
before_action :authorize_admin_project!
......
# frozen_string_literal: true
class Projects::HookLogsController < Projects::ApplicationController
include HooksExecution
......
# frozen_string_literal: true
class Projects::HooksController < Projects::ApplicationController
include HooksExecution
......
# frozen_string_literal: true
class Projects::ImportsController < Projects::ApplicationController
include ContinueParams
include SafeMirrorParams
......
# frozen_string_literal: true
class Projects::IssuesController < Projects::ApplicationController
include RendersNotes
include ToggleSubscriptionAction
......
# frozen_string_literal: true
class Projects::JobsController < Projects::ApplicationController
include SendFileUpload
......
# 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
......
# frozen_string_literal: true
class Projects::LfsApiController < Projects::GitHttpClientController
include ApplicationSettingsHelper
include ApplicationHelper
......
# frozen_string_literal: true
class Projects::LfsLocksApiController < Projects::GitHttpClientController
include LfsRequest
......
# frozen_string_literal: true
class Projects::LfsStorageController < Projects::GitHttpClientController
include LfsRequest
include WorkhorseRequest
......
# frozen_string_literal: true
class Projects::MattermostsController < Projects::ApplicationController
include TriggersHelper
include ActionView::Helpers::AssetUrlHelper
......
# frozen_string_literal: true
class Projects::MergeRequests::ApplicationController < Projects::ApplicationController
prepend ::EE::Projects::MergeRequests::ApplicationController
......
# frozen_string_literal: true
class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::ApplicationController
include IssuableActions
......
# frozen_string_literal: true
class Projects::MergeRequests::CreationsController < Projects::MergeRequests::ApplicationController
include DiffForPath
include DiffHelper
......
# frozen_string_literal: true
class Projects::MergeRequests::DiffsController < Projects::MergeRequests::ApplicationController
include DiffForPath
include DiffHelper
......
# frozen_string_literal: true
class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController
include ToggleSubscriptionAction
include IssuableActions
......
# 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
......
# frozen_string_literal: true
class Projects::MirrorsController < Projects::ApplicationController
include RepositorySettingsRedirect
......
# frozen_string_literal: true
class Projects::NetworkController < Projects::ApplicationController
include ExtractsPath
include ApplicationHelper
......
# frozen_string_literal: true
class Projects::NotesController < Projects::ApplicationController
include RendersNotes
include NotesActions
......
# frozen_string_literal: true
class Projects::PagesController < Projects::ApplicationController
layout 'project_settings'
......
# frozen_string_literal: true
class Projects::PagesDomainsController < Projects::ApplicationController
layout 'project_settings'
......
# frozen_string_literal: true
class Projects::PipelineSchedulesController < Projects::ApplicationController
before_action :schedule, except: [:index, :new, :create]
......
# frozen_string_literal: true
class Projects::PipelinesController < Projects::ApplicationController
prepend ::EE::Projects::PipelinesController
......
# frozen_string_literal: true
class Projects::PipelinesSettingsController < Projects::ApplicationController
before_action :authorize_admin_pipeline!
......
# frozen_string_literal: true
class Projects::ProjectMembersController < Projects::ApplicationController
include MembershipActions
include MembersPresentation
......
# frozen_string_literal: true
module Projects
module Prometheus
class MetricsController < Projects::ApplicationController
......
# frozen_string_literal: true
class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
protected
......
# frozen_string_literal: true
class Projects::ProtectedRefsController < Projects::ApplicationController
include RepositorySettingsRedirect
......
# frozen_string_literal: true
class Projects::ProtectedTagsController < Projects::ProtectedRefsController
protected
......
# frozen_string_literal: true
# Controller for viewing a file's raw
class Projects::RawController < Projects::ApplicationController
include ExtractsPath
......
# frozen_string_literal: true
class Projects::RefsController < Projects::ApplicationController
include ExtractsPath
include TreeHelper
......
# frozen_string_literal: true
module Projects
module Registry
class ApplicationController < Projects::ApplicationController
......
# frozen_string_literal: true
module Projects
module Registry
class RepositoriesController < ::Projects::Registry::ApplicationController
......
# frozen_string_literal: true
module Projects
module Registry
class TagsController < ::Projects::Registry::ApplicationController
......
# frozen_string_literal: true
class Projects::ReleasesController < Projects::ApplicationController
# Authorize
before_action :require_non_empty_project
......
# frozen_string_literal: true
class Projects::RepositoriesController < Projects::ApplicationController
include ExtractsPath
......
# frozen_string_literal: true
class Projects::RunnerProjectsController < Projects::ApplicationController
before_action :authorize_admin_build!
......
# frozen_string_literal: true
class Projects::RunnersController < Projects::ApplicationController
before_action :authorize_admin_build!
before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
......
# frozen_string_literal: true
class Projects::ServicesController < Projects::ApplicationController
include ServiceParams
......
# frozen_string_literal: true
module Projects
module Settings
class CiCdController < Projects::ApplicationController
......
# frozen_string_literal: true
module Projects
module Settings
class IntegrationsController < Projects::ApplicationController
......
# frozen_string_literal: true
module Projects
module Settings
class RepositoryController < Projects::ApplicationController
......
# frozen_string_literal: true
class Projects::SnippetsController < Projects::ApplicationController
include RendersNotes
include ToggleAwardEmoji
......
# frozen_string_literal: true
class Projects::TagsController < Projects::ApplicationController
include SortingHelper
......
# frozen_string_literal: true
class Projects::TemplatesController < Projects::ApplicationController
before_action :authenticate_user!, :get_template_class
......
# frozen_string_literal: true
class Projects::TodosController < Projects::ApplicationController
include Gitlab::Utils::StrongMemoize
include TodosActions
......
# frozen_string_literal: true
# Controller for viewing a repository's file structure
class Projects::TreeController < Projects::ApplicationController
include ExtractsPath
......
# frozen_string_literal: true
class Projects::TriggersController < Projects::ApplicationController
before_action :authorize_admin_build!
before_action :authorize_manage_trigger!, except: [:index, :create]
......
# frozen_string_literal: true
class Projects::UploadsController < Projects::ApplicationController
include UploadsActions
include WorkhorseRequest
......
# frozen_string_literal: true
class Projects::VariablesController < Projects::ApplicationController
prepend ::EE::Projects::VariablesController
......
# frozen_string_literal: true
class Projects::WikisController < Projects::ApplicationController
include PreviewMarkdown
include Gitlab::Utils::StrongMemoize
......
# frozen_string_literal: true
module Sherlock
class ApplicationController < ::ApplicationController
before_action :find_transaction
......
# frozen_string_literal: true
module Sherlock
class FileSamplesController < Sherlock::ApplicationController
def show
......
# frozen_string_literal: true
module Sherlock
class QueriesController < Sherlock::ApplicationController
def show
......
# frozen_string_literal: true
module Sherlock
class TransactionsController < Sherlock::ApplicationController
def index
......
# frozen_string_literal: true
class Snippets::NotesController < ApplicationController
include NotesActions
include ToggleAwardEmoji
......
# frozen_string_literal: true
module Users
class TermsController < ApplicationController
include InternalRedirect
......
......@@ -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
......
......@@ -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")
......
---
title: Preserve order of project tags list
merge_request: 21897
author:
type: changed
---
title: Enable even more frozen string in app/controllers
merge_request:
author: gfyoung
type: performance
......@@ -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
......
......@@ -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:
......
......@@ -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
......
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment