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

# Conflicts:
#	db/schema.rb
#	spec/services/notes/create_service_spec.rb
#	spec/support/shared_examples/services/boards/issues_move_service.rb

[ci skip]

app/controllers/concerns/repository_settings_redirect.rb

 module RepositorySettingsRedirect
   extend ActiveSupport::Concern
 
-  def redirect_to_repository_settings(project)
-    redirect_to project_settings_repository_path(project)
+  def redirect_to_repository_settings(project, anchor: nil)
+    redirect_to project_settings_repository_path(project, anchor: anchor)
   end
 end

app/controllers/groups_controller.rb

@@ -86,7 +86,7 @@ class GroupsController < Groups::ApplicationController
 
   def update
     if Groups::UpdateService.new(@group, current_user, group_params).execute
-      redirect_to edit_group_path(@group), notice: "Group '#{@group.name}' was successfully updated."
+      redirect_to edit_group_path(@group, anchor: params[:update_section]), notice: "Group '#{@group.name}' was successfully updated."
     else
       @group.restore_path!
 

app/controllers/projects/avatars_controller.rb

@@ -21,6 +21,6 @@ class Projects::AvatarsController < Projects::ApplicationController
 
     @project.save
 
-    redirect_to edit_project_path(@project), status: :found
+    redirect_to edit_project_path(@project, anchor: 'js-general-project-settings'), status: :found
   end
 end

app/controllers/projects/deploy_keys_controller.rb

@@ -10,7 +10,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
 
   def index
     respond_to do |format|
-      format.html { redirect_to_repository_settings(@project) }
+      format.html { redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings') }
       format.json do
         render json: Projects::Settings::DeployKeysPresenter.new(@project, current_user: current_user).as_json
       end
@@ -18,7 +18,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
   end
 
   def new
-    redirect_to_repository_settings(@project)
+    redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings')
   end
 
   def create
@@ -30,7 +30,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
       flash[:alert] = @key.errors.full_messages.join(', ').html_safe
     end
 
-    redirect_to_repository_settings(@project)
+    redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings')
   end
 
   def edit
@@ -39,7 +39,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
   def update
     if deploy_key.update(update_params)
       flash[:notice] = 'Deploy key was successfully updated.'
-      redirect_to_repository_settings(@project)
+      redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings')
     else
       render 'edit'
     end
@@ -51,7 +51,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
     log_audit_event(@key.title, action: :create)
 
     respond_to do |format|
-      format.html { redirect_to_repository_settings(@project) }
+      format.html { redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings') }
       format.json { head :ok }
     end
   end
@@ -65,7 +65,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
     log_audit_event(@key.title, action: :destroy)
 
     respond_to do |format|
-      format.html { redirect_to_repository_settings(@project) }
+      format.html { redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings') }
       format.json { head :ok }
     end
   end

app/controllers/projects/deploy_tokens_controller.rb

@@ -5,6 +5,6 @@ class Projects::DeployTokensController < Projects::ApplicationController
     @token = @project.deploy_tokens.find(params[:id])
     @token.revoke!
 
-    redirect_to project_settings_repository_path(project)
+    redirect_to project_settings_repository_path(project, anchor: 'js-deploy-tokens')
   end
 end

app/controllers/projects/mirrors_controller.rb

@@ -11,7 +11,7 @@ class Projects::MirrorsController < Projects::ApplicationController
   layout "project_settings"
 
   def show
-    redirect_to_repository_settings(project)
+    redirect_to_repository_settings(project, anchor: 'js-push-remote-settings')
   end
 
   def update
@@ -24,7 +24,7 @@ class Projects::MirrorsController < Projects::ApplicationController
     end
 
     respond_to do |format|
-      format.html { redirect_to_repository_settings(project) }
+      format.html { redirect_to_repository_settings(project, anchor: 'js-push-remote-settings') }
       format.json do
         if project.errors.present?
           render json: project.errors, status: :unprocessable_entity
@@ -41,7 +41,7 @@ class Projects::MirrorsController < Projects::ApplicationController
       flash[:notice] = "The remote repository is being updated..."
     end
 
-    redirect_to_repository_settings(project)
+    redirect_to_repository_settings(project, anchor: 'js-push-remote-settings')
   end
 
   private

app/controllers/projects/protected_refs_controller.rb

@@ -19,7 +19,7 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
       flash[:alert] = protected_ref.errors.full_messages.join(', ').html_safe
     end
 
-    redirect_to_repository_settings(@project)
+    redirect_to_repository_settings(@project, anchor: params[:update_section])
   end
 
   def show
@@ -40,7 +40,7 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
     destroy_service_class.new(@project, current_user).execute(@protected_ref)
 
     respond_to do |format|
-      format.html { redirect_to_repository_settings(@project) }
+      format.html { redirect_to_repository_settings(@project, anchor: params[:update_section]) }
       format.js { head :ok }
     end
   end

app/controllers/projects_controller.rb

@@ -63,7 +63,7 @@ class ProjectsController < Projects::ApplicationController
         flash[:notice] = _("Project '%{project_name}' was successfully updated.") % { project_name: @project.name }
 
         format.html do
-          redirect_to(edit_project_path(@project))
+          redirect_to(edit_project_path(@project, anchor: 'js-general-project-settings'))
         end
       else
         flash.now[:alert] = result[:message]
@@ -176,7 +176,7 @@ class ProjectsController < Projects::ApplicationController
     )
   rescue ::Projects::HousekeepingService::LeaseTaken => ex
     redirect_to(
-      edit_project_path(@project),
+      edit_project_path(@project, anchor: 'js-project-advanced-settings'),
       alert: ex.to_s
     )
   end
@@ -185,7 +185,7 @@ class ProjectsController < Projects::ApplicationController
     @project.add_export_job(current_user: current_user)
 
     redirect_to(
-      edit_project_path(@project),
+      edit_project_path(@project, anchor: 'js-export-project'),
       notice: _("Project export started. A download link will be sent by email.")
     )
   end
@@ -197,7 +197,7 @@ class ProjectsController < Projects::ApplicationController
       send_file export_project_path, disposition: 'attachment'
     else
       redirect_to(
-        edit_project_path(@project),
+        edit_project_path(@project, anchor: 'js-export-project'),
         alert: _("Project export link has expired. Please generate a new export from your project settings.")
       )
     end
@@ -210,7 +210,7 @@ class ProjectsController < Projects::ApplicationController
       flash[:alert] = _("Project export could not be deleted.")
     end
 
-    redirect_to(edit_project_path(@project))
+    redirect_to(edit_project_path(@project, anchor: 'js-export-project'))
   end
 
   def generate_new_export
@@ -218,7 +218,7 @@ class ProjectsController < Projects::ApplicationController
       export
     else
       redirect_to(
-        edit_project_path(@project),
+        edit_project_path(@project, anchor: 'js-export-project'),
         alert: _("Project export could not be deleted.")
       )
     end

app/models/concerns/access_requestable.rb

+# frozen_string_literal: true
+
 # == AccessRequestable concern
 #
 # Contains functionality related to objects that can receive request for access.

app/models/concerns/artifact_migratable.rb

+# frozen_string_literal: true
+
 # Adapter class to unify the interface between mounted uploaders and the
 # Ci::Artifact model
 # Meant to be prepended so the interface can stay the same

app/models/concerns/atomic_internal_id.rb

+# frozen_string_literal: true
+
 # Include atomic internal id generation scheme for a model
 #
 # This allows us to atomically generate internal ids that are

app/models/concerns/avatarable.rb

+# frozen_string_literal: true
+
 module Avatarable
   extend ActiveSupport::Concern
 
@@ -57,7 +59,8 @@ module Avatarable
       only_path = false
     end
 
-    url_base = ""
+    url_base = []
+
     if use_asset_host
       url_base << asset_host unless only_path
     else
@@ -65,7 +68,7 @@ module Avatarable
       url_base << gitlab_config.relative_url_root
     end
 
-    url_base + avatar.local_url + query_params
+    url_base.join + avatar.local_url + query_params
   end
 
   # Path that is persisted in the tracking Upload model. Used to fetch the

app/models/concerns/awardable.rb

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

app/models/concerns/batch_destroy_dependent_associations.rb

+# frozen_string_literal: true
+
 # Provides a way to work around Rails issue where dependent objects are all
 # loaded into memory before destroyed: https://github.com/rails/rails/issues/22510.
 #

app/models/concerns/blob_like.rb

+# frozen_string_literal: true
+
 module BlobLike
   extend ActiveSupport::Concern
   include Linguist::BlobHelper

app/models/concerns/blocks_json_serialization.rb

+# frozen_string_literal: true
+
 # Overrides `as_json` and `to_json` to raise an exception when called in order
 # to prevent accidentally exposing attributes
 #

app/models/concerns/bulk_member_access_load.rb

+# frozen_string_literal: true
+
 # Returns and caches in thread max member access for a resource
 #
 module BulkMemberAccessLoad

app/models/concerns/cache_markdown_field.rb

+# frozen_string_literal: true
+
 # This module takes care of updating cache columns for Markdown-containing
 # fields. Use like this in the body of your class:
 #

app/models/concerns/cacheable_attributes.rb

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

app/models/concerns/case_sensitivity.rb

+# frozen_string_literal: true
+
 # Concern for querying columns with specific case sensitivity handling.
 module CaseSensitivity
   extend ActiveSupport::Concern

app/models/concerns/chronic_duration_attribute.rb

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

app/models/concerns/created_at_filterable.rb

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

app/models/concerns/deployment_platform.rb

+# frozen_string_literal: true
+
 module DeploymentPlatform
   # EE would override this and utilize environment argument
   # rubocop:disable Gitlab/ModuleWithInstanceVariables

app/models/concerns/diff_file.rb

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

app/models/concerns/discussion_on_diff.rb

+# frozen_string_literal: true
+
 # Contains functionality shared between `DiffDiscussion` and `LegacyDiffDiscussion`.
 module DiscussionOnDiff
   extend ActiveSupport::Concern

app/models/concerns/each_batch.rb

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

app/models/concerns/editable.rb

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

app/models/concerns/enum_with_nil.rb

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

app/models/concerns/expirable.rb

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

app/models/concerns/fast_destroy_all.rb

+# frozen_string_literal: true
+
 ##
 # This module is for replacing `dependent: :destroy` and `before_destroy` hooks.
 #

app/models/concerns/faster_cache_keys.rb

+# frozen_string_literal: true
+
 module FasterCacheKeys
   # A faster version of Rails' "cache_key" method.
   #

app/models/concerns/feature_gate.rb

+# frozen_string_literal: true
+
 module FeatureGate
   def flipper_id
     return nil if new_record?

app/models/concerns/ghost_user.rb

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

app/models/concerns/group_descendant.rb

+# frozen_string_literal: true
+
 module GroupDescendant
   # Returns the hierarchy of a project or group in the from of a hash upto a
   # given top.

app/models/concerns/has_status.rb

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

app/models/concerns/has_variable.rb

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

app/models/concerns/ignorable_column.rb

+# frozen_string_literal: true
+
 # Module that can be included into a model to make it easier to ignore database
 # columns.
 #

app/models/concerns/iid_routes.rb

+# frozen_string_literal: true
+
 module IidRoutes
   ##
   # This automagically enforces all related routes to use `iid` instead of `id`

app/models/concerns/importable.rb

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

app/models/concerns/issuable.rb

+# frozen_string_literal: true
+
 # == Issuable concern
 #
 # Contains common functionality shared between Issues and MergeRequests

app/models/concerns/loaded_in_group_list.rb

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

app/models/concerns/manual_inverse_association.rb

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

app/models/concerns/mentionable.rb

+# frozen_string_literal: true
+
 # == Mentionable concern
 #
 # Contains functionality related to objects that can mention Users, Issues, MergeRequests, Commits or Snippets by

app/models/concerns/mentionable/reference_regexes.rb

+# frozen_string_literal: true
+
 module Mentionable
   module ReferenceRegexes
     def self.reference_pattern(link_patterns, issue_pattern)

app/models/concerns/milestoneish.rb

+# frozen_string_literal: true
+
 module Milestoneish
   def closed_items_count(user)
     memoize_per_user(user, :closed_items_count) do

app/models/concerns/note_on_diff.rb

+# frozen_string_literal: true
+
 # Contains functionality shared between `DiffNote` and `LegacyDiffNote`.
 module NoteOnDiff
   extend ActiveSupport::Concern

app/models/concerns/noteable.rb

+# frozen_string_literal: true
+
 module Noteable
   # Names of all implementers of `Noteable` that support resolvable notes.
   RESOLVABLE_TYPES = %w(MergeRequest).freeze

app/models/concerns/participable.rb

+# frozen_string_literal: true
+
 # == Participable concern
 #
 # Contains functionality related to objects that can have participants, such as

app/models/concerns/presentable.rb

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

app/models/concerns/project_features_compatibility.rb

+# frozen_string_literal: true
+
 # Makes api V4 compatible with old project features permissions methods
 #
 # After migrating issues_enabled merge_requests_enabled builds_enabled snippets_enabled and wiki_enabled

app/models/concerns/prometheus_adapter.rb

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

app/models/concerns/protected_branch_access.rb

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

app/models/concerns/protected_ref.rb

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

app/models/concerns/protected_ref_access.rb

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

app/models/concerns/protected_tag_access.rb

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

app/models/concerns/reactive_caching.rb

+# frozen_string_literal: true
+
 # The ReactiveCaching concern is used to fetch some data in the background and
 # store it in the Rails cache, keeping it up-to-date for as long as it is being
 # requested.  If the data hasn't been requested for +reactive_cache_lifetime+,

app/models/concerns/reactive_service.rb

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

app/models/concerns/redis_cacheable.rb

+# frozen_string_literal: true
+
 module RedisCacheable
   extend ActiveSupport::Concern
   include Gitlab::Utils::StrongMemoize

app/models/concerns/referable.rb

+# frozen_string_literal: true
+
 # == Referable concern
 #
 # Contains functionality related to making a model referable in Markdown, such

app/models/concerns/relative_positioning.rb

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

app/models/concerns/resolvable_discussion.rb

+# frozen_string_literal: true
+
 module ResolvableDiscussion
   extend ActiveSupport::Concern
   include ::Gitlab::Utils::StrongMemoize

app/models/concerns/resolvable_note.rb

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

app/models/concerns/routable.rb

+# frozen_string_literal: true
+
 # Store object full path in separate table for easy lookup and uniq validation
 # Object must have name and path db fields and respond to parent and parent_changed? methods.
 module Routable

app/models/concerns/select_for_project_authorization.rb

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

app/models/concerns/sha_attribute.rb

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

app/models/concerns/sortable.rb

+# frozen_string_literal: true
+
 # == Sortable concern
 #
 # Set default scope for ordering objects

app/models/concerns/spammable.rb

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

app/models/concerns/storage/legacy_namespace.rb

+# frozen_string_literal: true
+
 module Storage
   module LegacyNamespace
     extend ActiveSupport::Concern

app/models/concerns/storage/legacy_project_wiki.rb

+# frozen_string_literal: true
+
 module Storage
   module LegacyProjectWiki
     extend ActiveSupport::Concern

app/models/concerns/storage/legacy_repository.rb

+# frozen_string_literal: true
+
 module Storage
   module LegacyRepository
     extend ActiveSupport::Concern

app/models/concerns/strip_attribute.rb

+# frozen_string_literal: true
+
 # == Strip Attribute module
 #
 # Contains functionality to clean attributes before validation

app/models/concerns/subscribable.rb

+# frozen_string_literal: true
+
 # == Subscribable concern
 #
 # Users can subscribe to these models.

app/models/concerns/taskable.rb

+# frozen_string_literal: true
+
 require 'task_list'
 require 'task_list/filter'
 

app/models/concerns/throttled_touch.rb

+# frozen_string_literal: true
+
 # ThrottledTouch can be used to throttle the number of updates triggered by
 # calling "touch" on an ActiveRecord model.
 module ThrottledTouch

app/models/concerns/time_trackable.rb

+# frozen_string_literal: true
+
 # == TimeTrackable concern
 #
 # Contains functionality related to objects that support time tracking.

app/models/concerns/token_authenticatable.rb

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

app/models/concerns/triggerable_hooks.rb

+# frozen_string_literal: true
+
 module TriggerableHooks
   AVAILABLE_TRIGGERS = {
     repository_update_hooks:  :repository_update_events,

app/models/concerns/uniquify.rb

+# frozen_string_literal: true
+
 # Uniquify
 #
 # Return a version of the given 'base' string that is unique

app/models/concerns/updated_at_filterable.rb

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

app/models/concerns/valid_attribute.rb

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

app/models/concerns/with_uploads.rb

+# frozen_string_literal: true
+
 # Mounted uploaders are destroyed by carrierwave's after_commit
 # hook. This hook fetches upload location (local vs remote) from
 # Upload model. So it's neccessary to make sure that during that

app/models/conversational_development_index/card.rb

+# frozen_string_literal: true
+
 module ConversationalDevelopmentIndex
   class Card
     attr_accessor :metric, :title, :description, :feature, :blog, :docs

app/models/conversational_development_index/idea_to_production_step.rb

+# frozen_string_literal: true
+
 module ConversationalDevelopmentIndex
   class IdeaToProductionStep
     attr_accessor :metric, :title, :features

app/models/conversational_development_index/metric.rb

+# frozen_string_literal: true
+
 module ConversationalDevelopmentIndex
   class Metric < ActiveRecord::Base
     include Presentable

app/models/diff_viewer/added.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class Added < Base
     include Simple

app/models/diff_viewer/base.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class Base
     PARTIAL_PATH_PREFIX = 'projects/diffs/viewers'.freeze

app/models/diff_viewer/client_side.rb

+# frozen_string_literal: true
+
 module DiffViewer
   module ClientSide
     extend ActiveSupport::Concern

app/models/diff_viewer/deleted.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class Deleted < Base
     include Simple

app/models/diff_viewer/image.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class Image < Base
     include Rich

app/models/diff_viewer/mode_changed.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class ModeChanged < Base
     include Simple

app/models/diff_viewer/no_preview.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class NoPreview < Base
     include Simple

app/models/diff_viewer/not_diffable.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class NotDiffable < Base
     include Simple

app/models/diff_viewer/renamed.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class Renamed < Base
     include Simple

app/models/diff_viewer/rich.rb

+# frozen_string_literal: true
+
 module DiffViewer
   module Rich
     extend ActiveSupport::Concern

app/models/diff_viewer/server_side.rb

+# frozen_string_literal: true
+
 module DiffViewer
   module ServerSide
     extend ActiveSupport::Concern

app/models/diff_viewer/simple.rb

+# frozen_string_literal: true
+
 module DiffViewer
   module Simple
     extend ActiveSupport::Concern

app/models/diff_viewer/static.rb

+# frozen_string_literal: true
+
 module DiffViewer
   module Static
     extend ActiveSupport::Concern

app/models/diff_viewer/text.rb

+# frozen_string_literal: true
+
 module DiffViewer
   class Text < Base
     include Simple

app/models/hooks/project_hook.rb

+# frozen_string_literal: true
+
 class ProjectHook < WebHook
   include CustomModelNaming
   include TriggerableHooks

app/models/hooks/service_hook.rb

+# frozen_string_literal: true
+
 class ServiceHook < WebHook
   belongs_to :service
   validates :service, presence: true

app/models/hooks/system_hook.rb

+# frozen_string_literal: true
+
 class SystemHook < WebHook
   include TriggerableHooks
 

app/models/hooks/web_hook.rb

+# frozen_string_literal: true
+
 class WebHook < ActiveRecord::Base
   include Sortable
 

app/models/hooks/web_hook_log.rb

+# frozen_string_literal: true
+
 class WebHookLog < ActiveRecord::Base
   belongs_to :web_hook
 

app/models/issue/metrics.rb

+# frozen_string_literal: true
+
 class Issue::Metrics < ActiveRecord::Base
   belongs_to :issue
 

app/models/members/group_member.rb

+# frozen_string_literal: true
+
 class GroupMember < Member
   SOURCE_TYPE = 'Namespace'.freeze
 

app/models/members/project_member.rb

+# frozen_string_literal: true
+
 class ProjectMember < Member
   SOURCE_TYPE = 'Project'.freeze
 

app/models/merge_request/metrics.rb

+# frozen_string_literal: true
+
 class MergeRequest::Metrics < ActiveRecord::Base
   belongs_to :merge_request
   belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :pipeline_id

app/models/network/commit.rb

+# frozen_string_literal: true
+
 module Network
   class Commit
     include ActionView::Helpers::TagHelper

app/models/network/graph.rb

+# frozen_string_literal: true
+
 module Network
   class Graph
     attr_reader :days, :commits, :map, :notes, :repo

app/views/groups/settings/_general.html.haml

 = form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f|
+  %input{ type: 'hidden', name: 'update_section', value: 'js-general-settings' }
   = form_errors(@group)
 
   %fieldset

app/views/groups/settings/_permissions.html.haml

 = form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f|
+  %input{ type: 'hidden', name: 'update_section', value: 'js-permissions-settings' }
   = form_errors(@group)
 
   %fieldset

app/views/projects/deploy_keys/_index.html.haml

 - expanded = Rails.env.test?
-%section.qa-deploy-keys-settings.settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       Deploy Keys

app/views/projects/deploy_tokens/_form.html.haml

 %p.profile-settings-content
   = s_("DeployTokens|Pick a name for the application, and we'll give you a unique deploy token.")
 
-= form_for token, url: create_deploy_token_namespace_project_settings_repository_path(project.namespace, project), method: :post do |f|
+= form_for token, url: create_deploy_token_namespace_project_settings_repository_path(project.namespace, project, anchor: 'js-deploy-tokens'), method: :post do |f|
   = form_errors(token)
 
   .form-group

app/views/projects/edit.html.haml

@@ -15,6 +15,7 @@
     .settings-content
       .project-edit-errors
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f|
+        %input{ name: 'update_section', type: 'hidden', value: 'js-general-project-settings' }
         %fieldset
           .row
             .form-group.col-md-9
@@ -75,6 +76,7 @@
         Enable or disable certain project features and choose access levels.
     .settings-content
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "sharing-permissions-form" }, authenticity_token: true do |f|
+        %input{ name: 'update_section', type: 'hidden', value: 'js-shared-permissions' }
         -# haml-lint:disable InlineJavaScript
         %script.js-project-permissions-form-data{ type: "application/json" }= project_permissions_panel_data(@project)
         .js-project-permissions-form
@@ -94,6 +96,7 @@
       = render_if_exists 'shared/promotions/promote_mr_features'
 
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f|
+        %input{ name: 'update_section', type: 'hidden', value: 'js-merge-request-settings' }
         = render 'projects/merge_request_settings', form: f
         = f.submit 'Save changes', class: "btn btn-save qa-save-merge-request-changes"
 

app/views/projects/protected_branches/shared/_create_protected_branch.html.haml

 = form_for [@project.namespace.becomes(Namespace), @project, @protected_branch], html: { class: 'new-protected-branch js-new-protected-branch' } do |f|
+  %input{ type: 'hidden', name: 'update_section', value: 'js-protected-branches-settings' }
   .card
     .card-header
       %h3.card-title

app/views/projects/protected_branches/shared/_index.html.haml

 - expanded = Rails.env.test?
 
-%section.qa-protected-branches-settings.settings.no-animate{ class: ('expanded' if expanded) }
+%section.qa-protected-branches-settings.settings.no-animate#js-protected-branches-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
       Protected Branches

app/views/projects/protected_branches/shared/_protected_branch.html.haml

@@ -21,4 +21,4 @@
 
   - if can_admin_project
     %td
-      = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_branch], disabled: local_assigns[:disabled], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-warning"
+      = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_branch, { update_section: 'js-protected-branches-settings' }], disabled: local_assigns[:disabled], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-warning"

app/views/projects/protected_tags/shared/_create_protected_tag.html.haml

 = form_for [@project.namespace.becomes(Namespace), @project, @protected_tag], html: { class: 'new-protected-tag js-new-protected-tag' } do |f|
+  %input{ type: 'hidden', name: 'update_section', value: 'js-protected-tags-settings' }
   .card
     .card-header
       %h3.card-title

app/views/projects/protected_tags/shared/_protected_tag.html.haml

@@ -19,4 +19,4 @@
 
   - if can? current_user, :admin_project, @project
     %td
-      = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_tag], data: { confirm: 'Tag will be writable for developers. Are you sure?' }, method: :delete, class: 'btn btn-warning'
+      = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_tag, { update_section: 'js-protected-tags-settings' }], data: { confirm: 'Tag will be writable for developers. Are you sure?' }, method: :delete, class: 'btn btn-warning'

app/views/projects/update.js.haml

 - if @project.valid?
   :plain
-    location.href = "#{edit_project_path(@project)}";
+    location.href = "#{edit_project_path(@project, anchor: params[:update_section])}";
+    location.reload();
 - else
   :plain
     $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");

changelogs/unreleased/ci-builds-status-index.yml

+---
+title: Remove redundant ci_builds (status) index
+merge_request: 21070
+author:
+type: performance

db/migrate/20180807153545_remove_redundant_status_index_on_ci_builds.rb

+# frozen_string_literal: true
+
+class RemoveRedundantStatusIndexOnCiBuilds < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index :ci_builds, :status
+  end
+
+  def down
+    add_concurrent_index :ci_builds, :status
+  end
+end

db/schema.rb

@@ -11,7 +11,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20180803001726) do
+=======
+ActiveRecord::Schema.define(version: 20180807153545) do
+>>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -441,7 +445,6 @@ ActiveRecord::Schema.define(version: 20180803001726) do
   add_index "ci_builds", ["stage_id", "stage_idx"], name: "tmp_build_stage_position_index", where: "(stage_idx IS NOT NULL)", using: :btree
   add_index "ci_builds", ["stage_id"], name: "index_ci_builds_on_stage_id", using: :btree
   add_index "ci_builds", ["status", "type", "runner_id"], name: "index_ci_builds_on_status_and_type_and_runner_id", using: :btree
-  add_index "ci_builds", ["status"], name: "index_ci_builds_on_status", using: :btree
   add_index "ci_builds", ["token"], name: "index_ci_builds_on_token", unique: true, using: :btree
   add_index "ci_builds", ["updated_at"], name: "index_ci_builds_on_updated_at", using: :btree
   add_index "ci_builds", ["user_id"], name: "index_ci_builds_on_user_id", using: :btree

spec/controllers/projects/deploy_keys_controller_spec.rb

@@ -19,7 +19,7 @@ describe Projects::DeployKeysController do
       it 'redirects to blob' do
         get :index, params
 
-        expect(response).to redirect_to(namespace_project_settings_repository_path(params))
+        expect(response).to redirect_to(project_settings_repository_path(project, anchor: 'js-deploy-keys-settings'))
       end
     end
 

spec/controllers/projects/mirrors_controller_spec.rb

@@ -36,7 +36,7 @@ describe Projects::MirrorsController do
       it 'processes a successful update' do
         do_put(project, remote_mirrors_attributes: remote_mirror_attributes)
 
-        expect(response).to redirect_to(project_settings_repository_path(project))
+        expect(response).to redirect_to(project_settings_repository_path(project, anchor: 'js-push-remote-settings'))
         expect(flash[:notice]).to match(/successfully updated/)
       end
 
@@ -53,7 +53,7 @@ describe Projects::MirrorsController do
       it 'processes an unsuccessful update' do
         do_put(project, remote_mirrors_attributes: remote_mirror_attributes)
 
-        expect(response).to redirect_to(project_settings_repository_path(project))
+        expect(response).to redirect_to(project_settings_repository_path(project, anchor: 'js-push-remote-settings'))
         expect(flash[:alert]).to match(/Only allowed protocols are/)
       end
 

spec/services/notes/create_service_spec.rb

@@ -145,10 +145,15 @@ describe Notes::CreateService do
           let(:note_text) { %(HELLO\n/close\n/assign @#{user.username}\nWORLD) }
 
           it 'saves the note and does not alter the note text' do
+<<<<<<< HEAD
             service = instance_double('Issues::UpdateService', :service)
 
             allow(Issues::UpdateService).to receive(:new).and_return(service)
 
+=======
+            service = double(:service)
+            allow(Issues::UpdateService).to receive(:new).and_return(service)
+>>>>>>> upstream/master
             expect(service).to receive(:execute)
 
             note = described_class.new(project, user, opts.merge(note: note_text)).execute

spec/support/shared_examples/services/boards/issues_move_service.rb

@@ -4,10 +4,15 @@ shared_examples 'issues move service' do |group|
     let(:params) { { board_id: board1.id, from_list_id: list1.id, to_list_id: list2.id } }
 
     it 'delegates the label changes to Issues::UpdateService' do
+<<<<<<< HEAD
       service = instance_double('Issues::UpdateService', :service)
 
       allow(Issues::UpdateService).to receive(:new).and_return(service)
 
+=======
+      service = double(:service)
+      expect(Issues::UpdateService).to receive(:new).and_return(service)
+>>>>>>> upstream/master
       expect(service).to receive(:execute).with(issue).once
 
       described_class.new(parent, user, params).execute(issue)