Automatic merge of gitlab-org/gitlab-ce master

app/models/list.rb

@@ -56,6 +56,6 @@ class List < ActiveRecord::Base
   private
 
   def can_be_destroyed
-    destroyable?
+    throw(:abort) unless destroyable?
   end
 end

changelogs/unreleased/deprecated-callback-false.yml

+---
+title: 'Fix deprecation: returning false in Active Record and Active Model callbacks
+  will not implicitly halt a callback chain'
+merge_request: 24134
+author: Jasper Maes
+type: other

config/initializers/new_framework_defaults.rb

@@ -22,6 +22,3 @@ ActiveSupport.to_time_preserves_timezone = false
 
 # Require `belongs_to` associations by default. Previous versions had false.
 Rails.application.config.active_record.belongs_to_required_by_default = false
-
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = true

doc/development/documentation/index.md

@@ -14,7 +14,7 @@ In addition to this page, the following resources to help craft and contribute d
   - [Feature-change documentation workflow](feature-change-workflow.md) - Adding required documentation when developing a GitLab feature.
   - [Documentation improvement worflow](improvement-workflow.md) - New content not associated with a new feature.
 - [Markdown Guide](https://about.gitlab.com/handbook/product/technical-writing/markdown-guide/) - A reference for the markdown implementation used by GitLab's documentation site and about.gitlab.com.
-- [Site architecture](/doc/development/documentation/site_architecture/index.md) - How docs.gitlab.com is built.
+- [Site architecture](site_architecture/index.md) - How docs.gitlab.com is built.
 
 ## Source and rendered locations