Add latest changes from gitlab-org/gitlab@master

.rubocop_todo.yml

@@ -268,11 +268,6 @@ Naming/RescuedExceptionsVariableName:
 RSpec/ContextWording:
   Enabled: false
-# Offense count: 407
-# Cop supports --auto-correct.
-RSpec/EmptyLineAfterFinalLet:
-  Enabled: false
-
 # Offense count: 719
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

app/assets/javascripts/ide/stores/actions.js

@@ -110,6 +110,7 @@ export const createTempEntry = (
       commit(types.ADD_FILE_TO_CHANGED, file.path);
       dispatch('setFileActive', file.path);
       dispatch('triggerFilesChange');
+      dispatch('burstUnusedSeal');
     }
     if (parentPath && !state.entries[parentPath].opened) {
@@ -222,7 +223,9 @@ export const deleteEntry = ({ commit, dispatch, state }, path) => {
     dispatch('deleteEntry', prevPath);
     return;
   }
-  if (state.unusedSeal) dispatch('burstUnusedSeal');
+
+  dispatch('burstUnusedSeal');
+
   if (entry.opened) dispatch('closeFile', entry);
   if (isTree) {
@@ -267,6 +270,7 @@ export const renameEntry = ({ dispatch, commit, state }, { path, name, parentPat
       commit(types.REMOVE_FILE_FROM_STAGED_AND_CHANGED, newEntry);
     } else if (!isInChanges) {
       commit(types.ADD_FILE_TO_CHANGED, newPath);
+      dispatch('burstUnusedSeal');
     }
     if (!newEntry.tempFile) {

changelogs/unreleased/43517-no-changes.yml

+---
+title: Fix "No changes" empty state showing up in changes tab, despite there being
+  changes
+merge_request: 21713
+author:
+type: fixed

db/migrate/20180305144721_add_privileged_to_runner.rb

@@ -9,7 +9,7 @@ class AddPrivilegedToRunner < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default :clusters_applications_runners, :privileged, :boolean, default: true, allow_null: false
+    add_column_with_default :clusters_applications_runners, :privileged, :boolean, default: true, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20180423204600_add_pages_access_level_to_project_feature.rb

@@ -5,7 +5,7 @@ class AddPagesAccessLevelToProjectFeature < ActiveRecord::Migration[4.2]
   DOWNTIME = false
   def up
-    add_column_with_default(:project_features, :pages_access_level, :integer, default: ProjectFeature::PUBLIC, allow_null: false)
+    add_column_with_default(:project_features, :pages_access_level, :integer, default: ProjectFeature::PUBLIC, allow_null: false) # rubocop:disable Migration/AddColumnWithDefault
     change_column_default(:project_features, :pages_access_level, ProjectFeature::ENABLED)
   end

db/migrate/20180515005612_add_squash_to_merge_requests.rb

@@ -10,7 +10,7 @@ class AddSquashToMergeRequests < ActiveRecord::Migration[4.2]
   def up
     unless column_exists?(:merge_requests, :squash)
       # rubocop:disable Migration/UpdateLargeTable
-      add_column_with_default :merge_requests, :squash, :boolean, default: false, allow_null: false
+      add_column_with_default :merge_requests, :squash, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
     end
   end

db/migrate/20180529093006_ensure_remote_mirror_columns.rb

@@ -11,7 +11,7 @@ class EnsureRemoteMirrorColumns < ActiveRecord::Migration[4.2]
     add_column :remote_mirrors, :remote_name, :string unless column_exists?(:remote_mirrors, :remote_name) # rubocop:disable Migration/AddLimitToStringColumns
     unless column_exists?(:remote_mirrors, :only_protected_branches)
-      add_column_with_default(:remote_mirrors,
+      add_column_with_default(:remote_mirrors, # rubocop:disable Migration/AddColumnWithDefault
                               :only_protected_branches,
                               :boolean,
                               default: false,

db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb

@@ -10,7 +10,7 @@ class AddDeployStrategyToProjectAutoDevops < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default :project_auto_devops, :deploy_strategy, :integer, default: 0, allow_null: false
+    add_column_with_default :project_auto_devops, :deploy_strategy, :integer, default: 0, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20181016141739_add_status_to_deployments.rb

@@ -15,7 +15,7 @@ class AddStatusToDeployments < ActiveRecord::Migration[4.2]
   # However, we have to use the default value for avoiding `NOT NULL` violation during the transition period.
   # The default value should be removed in the future release.
   def up
-    add_column_with_default(:deployments,
+    add_column_with_default(:deployments, # rubocop:disable Migration/AddColumnWithDefault
       :status,
       :integer,
       limit: 2,

db/migrate/20190218134158_add_masked_to_ci_variables.rb

@@ -12,7 +12,7 @@ class AddMaskedToCiVariables < ActiveRecord::Migration[5.0]
   disable_ddl_transaction!
   def up
-    add_column_with_default :ci_variables, :masked, :boolean, default: false, allow_null: false
+    add_column_with_default :ci_variables, :masked, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20190218134209_add_masked_to_ci_group_variables.rb

@@ -12,7 +12,7 @@ class AddMaskedToCiGroupVariables < ActiveRecord::Migration[5.0]
   disable_ddl_transaction!
   def up
-    add_column_with_default :ci_group_variables, :masked, :boolean, default: false, allow_null: false
+    add_column_with_default :ci_group_variables, :masked, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20190228192410_add_multi_line_attributes_to_suggestion.rb

@@ -8,9 +8,11 @@ class AddMultiLineAttributesToSuggestion < ActiveRecord::Migration[5.0]
   disable_ddl_transaction!
   def up
+    # rubocop:disable Migration/AddColumnWithDefault
     add_column_with_default :suggestions, :lines_above, :integer, default: 0, allow_null: false
     add_column_with_default :suggestions, :lines_below, :integer, default: 0, allow_null: false
     add_column_with_default :suggestions, :outdated, :boolean, default: false, allow_null: false
+    # rubocop:enable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20190416185130_add_merge_train_enabled_to_ci_cd_settings.rb

@@ -8,7 +8,7 @@ class AddMergeTrainEnabledToCiCdSettings < ActiveRecord::Migration[5.1]
   disable_ddl_transaction!
   def up
-    add_column_with_default :project_ci_cd_settings, :merge_trains_enabled, :boolean, default: false, allow_null: false
+    add_column_with_default :project_ci_cd_settings, :merge_trains_enabled, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20190426180107_add_deployment_events_to_services.rb

@@ -8,7 +8,7 @@ class AddDeploymentEventsToServices < ActiveRecord::Migration[5.0]
   disable_ddl_transaction!
   def up
-    add_column_with_default(:services, :deployment_events, :boolean, default: false, allow_null: false)
+    add_column_with_default(:services, :deployment_events, :boolean, default: false, allow_null: false) # rubocop:disable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20190709204413_add_rule_type_to_approval_project_rules.rb

@@ -8,7 +8,7 @@ class AddRuleTypeToApprovalProjectRules < ActiveRecord::Migration[5.1]
   disable_ddl_transaction!
   def up
-    add_column_with_default :approval_project_rules, :rule_type, :integer, limit: 2, default: 0, allow_null: false
+    add_column_with_default :approval_project_rules, :rule_type, :integer, limit: 2, default: 0, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20190907184714_add_show_whitespace_in_diffs_to_user_preferences.rb

@@ -11,7 +11,7 @@ class AddShowWhitespaceInDiffsToUserPreferences < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default :user_preferences, :show_whitespace_in_diffs, :boolean, default: true, allow_null: false
+    add_column_with_default :user_preferences, :show_whitespace_in_diffs, :boolean, default: true, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20190918104731_add_cleanup_status_to_cluster.rb

@@ -9,7 +9,7 @@ class AddCleanupStatusToCluster < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default(:clusters, :cleanup_status,
+    add_column_with_default(:clusters, :cleanup_status, # rubocop:disable Migration/AddColumnWithDefault
       :smallint,
       default: 1,
       allow_null: false)

db/migrate/20191029191901_add_enabled_to_grafana_integrations.rb

@@ -8,7 +8,7 @@ class AddEnabledToGrafanaIntegrations < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default(
+    add_column_with_default( # rubocop:disable Migration/AddColumnWithDefault
       :grafana_integrations,
       :enabled,
       :boolean,

db/migrate/20191112090226_add_artifacts_to_ci_build_need.rb

@@ -8,7 +8,7 @@ class AddArtifactsToCiBuildNeed < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default(:ci_build_needs, :artifacts,
+    add_column_with_default(:ci_build_needs, :artifacts, # rubocop:disable Migration/AddColumnWithDefault
                             :boolean,
                             default: true,
                             allow_null: false)

doc/development/what_requires_downtime.md

@@ -34,6 +34,9 @@ blocking access to the table being modified. See ["Adding Columns With Default
 Values"](migration_style_guide.md#adding-columns-with-default-values) for more
 information on how to use this method.
+Note that usage of `add_column_with_default` with `allow_null: false` to also add
+a `NOT NULL` constraint is [discouraged](https://gitlab.com/gitlab-org/gitlab/issues/38060).
+
 ## Dropping Columns
 Removing columns is tricky because running GitLab processes may still be using