From c3b07bf09b0d91d3372b86e1099dea269734271d Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 5 Jun 2019 12:51:38 +0530
Subject: [PATCH] Refresh patch

---
 debian/patches/0680-rails-5_1.patch | 264 ++++++++++++++--------------
 1 file changed, 132 insertions(+), 132 deletions(-)

diff --git a/debian/patches/0680-rails-5_1.patch b/debian/patches/0680-rails-5_1.patch
index 97a505cf50..57441b1ccf 100644
--- a/debian/patches/0680-rails-5_1.patch
+++ b/debian/patches/0680-rails-5_1.patch
@@ -230,7 +230,7 @@ Model.new.attributes now also returns encrypted attributes.
  
 --- a/app/models/merge_request.rb
 +++ b/app/models/merge_request.rb
-@@ -741,7 +741,7 @@
+@@ -753,7 +753,7 @@
    end
  
    def reload_diff_if_branch_changed
@@ -316,7 +316,7 @@ Model.new.attributes now also returns encrypted attributes.
  
    acts_as_ordered_taggable
  
-@@ -1426,7 +1426,7 @@
+@@ -1442,7 +1442,7 @@
  
    # update visibility_level of forks
    def update_forks_visibility_level
@@ -750,7 +750,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "default_projects_limit"
      t.boolean "signup_enabled"
      t.boolean "gravatar_enabled"
-@@ -190,7 +190,7 @@
+@@ -191,7 +191,7 @@
      t.index ["usage_stats_set_by_user_id"], name: "index_application_settings_on_usage_stats_set_by_user_id", using: :btree
    end
  
@@ -759,7 +759,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "author_id", null: false
      t.string "type", null: false
      t.integer "entity_id", null: false
-@@ -201,7 +201,7 @@
+@@ -202,7 +202,7 @@
      t.index ["entity_id", "entity_type"], name: "index_audit_events_on_entity_id_and_entity_type", using: :btree
    end
  
@@ -768,7 +768,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "name"
      t.integer "user_id"
      t.integer "awardable_id"
-@@ -212,7 +212,7 @@
+@@ -213,7 +213,7 @@
      t.index ["user_id", "name"], name: "index_award_emoji_on_user_id_and_name", using: :btree
    end
  
@@ -777,7 +777,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "link_url", null: false
      t.string "image_url", null: false
      t.integer "project_id"
-@@ -224,7 +224,7 @@
+@@ -225,7 +225,7 @@
      t.index ["project_id"], name: "index_badges_on_project_id", using: :btree
    end
  
@@ -786,7 +786,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
      t.integer "user_id"
-@@ -236,7 +236,7 @@
+@@ -237,7 +237,7 @@
      t.index ["user_id"], name: "index_board_group_recent_visits_on_user_id", using: :btree
    end
  
@@ -795,7 +795,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
      t.integer "user_id"
-@@ -248,7 +248,7 @@
+@@ -249,7 +249,7 @@
      t.index ["user_id"], name: "index_board_project_recent_visits_on_user_id", using: :btree
    end
  
@@ -804,7 +804,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.datetime "created_at", null: false
      t.datetime "updated_at", null: false
-@@ -257,7 +257,7 @@
+@@ -258,7 +258,7 @@
      t.index ["project_id"], name: "index_boards_on_project_id", using: :btree
    end
  
@@ -813,7 +813,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.text "message", null: false
      t.datetime "starts_at", null: false
      t.datetime "ends_at", null: false
-@@ -270,7 +270,7 @@
+@@ -271,7 +271,7 @@
      t.index ["starts_at", "ends_at", "id"], name: "index_broadcast_messages_on_starts_at_and_ends_at_and_id", using: :btree
    end
  
@@ -822,7 +822,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id", null: false
      t.integer "service_id", null: false
      t.string "team_id", null: false
-@@ -284,7 +284,7 @@
+@@ -285,7 +285,7 @@
      t.index ["user_id", "service_id"], name: "index_chat_names_on_user_id_and_service_id", unique: true, using: :btree
    end
  
@@ -831,7 +831,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "namespace_id", null: false
      t.string "team_id"
      t.string "name"
-@@ -293,7 +293,7 @@
+@@ -294,7 +294,7 @@
      t.index ["namespace_id"], name: "index_chat_teams_on_namespace_id", unique: true, using: :btree
    end
  
@@ -840,7 +840,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "build_id", null: false
      t.integer "chunk_index", null: false
      t.integer "data_store", null: false
-@@ -301,13 +301,13 @@
+@@ -302,13 +302,13 @@
      t.index ["build_id", "chunk_index"], name: "index_ci_build_trace_chunks_on_build_id_and_chunk_index", unique: true, using: :btree
    end
  
@@ -856,7 +856,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.datetime_with_timezone "date_start", null: false
      t.datetime_with_timezone "date_end", null: false
-@@ -320,7 +320,7 @@
+@@ -321,7 +321,7 @@
      t.index ["section_name_id"], name: "index_ci_build_trace_sections_on_section_name_id", using: :btree
    end
  
@@ -865,7 +865,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "status"
      t.datetime "finished_at"
      t.text "trace"
-@@ -387,7 +387,7 @@
+@@ -388,7 +388,7 @@
      t.index ["user_id"], name: "index_ci_builds_on_user_id", using: :btree
    end
  
@@ -874,7 +874,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "build_id", null: false
      t.integer "project_id", null: false
      t.integer "timeout"
-@@ -398,7 +398,7 @@
+@@ -399,7 +399,7 @@
      t.index ["project_id"], name: "index_ci_builds_metadata_on_project_id", using: :btree
    end
  
@@ -883,7 +883,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "build_id", null: false
      t.string "url", null: false
      t.string "certificate"
-@@ -406,7 +406,7 @@
+@@ -407,7 +407,7 @@
      t.index ["build_id"], name: "index_ci_builds_runner_session_on_build_id", unique: true, using: :btree
    end
  
@@ -892,7 +892,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "key", null: false
      t.text "value"
      t.text "encrypted_value"
-@@ -420,7 +420,7 @@
+@@ -421,7 +421,7 @@
      t.index ["group_id", "key"], name: "index_ci_group_variables_on_group_id_and_key", unique: true, using: :btree
    end
  
@@ -901,7 +901,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "job_id", null: false
      t.integer "file_type", null: false
-@@ -459,7 +459,7 @@
+@@ -460,7 +460,7 @@
      t.index ["pipeline_schedule_id", "key"], name: "index_ci_pipeline_schedule_variables_on_schedule_id_and_key", unique: true, using: :btree
    end
  
@@ -910,7 +910,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "description"
      t.string "ref"
      t.string "cron"
-@@ -475,7 +475,7 @@
+@@ -476,7 +476,7 @@
      t.index ["project_id"], name: "index_ci_pipeline_schedules_on_project_id", using: :btree
    end
  
@@ -919,7 +919,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "key", null: false
      t.text "value"
      t.text "encrypted_value"
-@@ -485,7 +485,7 @@
+@@ -486,7 +486,7 @@
      t.index ["pipeline_id", "key"], name: "index_ci_pipeline_variables_on_pipeline_id_and_key", unique: true, using: :btree
    end
  
@@ -928,7 +928,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "ref"
      t.string "sha"
      t.string "before_sha"
-@@ -525,14 +525,14 @@
+@@ -526,14 +526,14 @@
      t.index ["user_id"], name: "index_ci_pipelines_on_user_id", using: :btree
    end
  
@@ -945,7 +945,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "runner_id", null: false
      t.datetime "created_at"
      t.datetime "updated_at"
-@@ -541,7 +541,7 @@
+@@ -542,7 +542,7 @@
      t.index ["runner_id"], name: "index_ci_runner_projects_on_runner_id", using: :btree
    end
  
@@ -954,7 +954,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "token"
      t.datetime "created_at"
      t.datetime "updated_at"
-@@ -569,7 +569,7 @@
+@@ -570,7 +570,7 @@
      t.index ["token_encrypted"], name: "index_ci_runners_on_token_encrypted", using: :btree
    end
  
@@ -963,7 +963,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.integer "pipeline_id"
      t.datetime "created_at"
-@@ -584,7 +584,7 @@
+@@ -585,7 +585,7 @@
      t.index ["project_id"], name: "index_ci_stages_on_project_id", using: :btree
    end
  
@@ -972,7 +972,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "trigger_id", null: false
      t.text "variables"
      t.datetime "created_at"
-@@ -594,7 +594,7 @@
+@@ -595,7 +595,7 @@
      t.index ["trigger_id"], name: "index_ci_trigger_requests_on_trigger_id", using: :btree
    end
  
@@ -981,7 +981,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "token"
      t.datetime "created_at"
      t.datetime "updated_at"
-@@ -606,7 +606,7 @@
+@@ -607,7 +607,7 @@
      t.index ["project_id"], name: "index_ci_triggers_on_project_id", using: :btree
    end
  
@@ -990,7 +990,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "key", null: false
      t.text "value"
      t.text "encrypted_value"
-@@ -619,14 +619,14 @@
+@@ -620,14 +620,14 @@
      t.index ["project_id", "key", "environment_scope"], name: "index_ci_variables_on_project_id_and_key_and_environment_scope", unique: true, using: :btree
    end
  
@@ -1007,7 +1007,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
-@@ -642,7 +642,7 @@
+@@ -643,7 +643,7 @@
      t.index ["cluster_id"], name: "index_cluster_platforms_kubernetes_on_cluster_id", unique: true, using: :btree
    end
  
@@ -1016,7 +1016,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "cluster_id", null: false
      t.datetime_with_timezone "created_at", null: false
-@@ -651,7 +651,7 @@
+@@ -652,7 +652,7 @@
      t.index ["project_id"], name: "index_cluster_projects_on_project_id", using: :btree
    end
  
@@ -1025,7 +1025,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.integer "status"
      t.integer "num_nodes", null: false
-@@ -669,7 +669,7 @@
+@@ -670,7 +670,7 @@
      t.index ["cluster_id"], name: "index_cluster_providers_gcp_on_cluster_id", unique: true, using: :btree
    end
  
@@ -1034,7 +1034,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id"
      t.integer "provider_type"
      t.integer "platform_type"
-@@ -685,7 +685,7 @@
+@@ -686,7 +686,7 @@
      t.index ["user_id"], name: "index_clusters_on_user_id", using: :btree
    end
  
@@ -1043,7 +1043,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.integer "status", null: false
      t.string "version", null: false
-@@ -696,7 +696,7 @@
+@@ -697,7 +697,7 @@
      t.index ["cluster_id"], name: "index_clusters_applications_cert_managers_on_cluster_id", unique: true, using: :btree
    end
  
@@ -1052,7 +1052,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
-@@ -709,7 +709,7 @@
+@@ -710,7 +710,7 @@
      t.index ["cluster_id"], name: "index_clusters_applications_helm_on_cluster_id", unique: true, using: :btree
    end
  
@@ -1061,7 +1061,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
-@@ -723,7 +723,7 @@
+@@ -724,7 +724,7 @@
      t.index ["cluster_id"], name: "index_clusters_applications_ingress_on_cluster_id", unique: true, using: :btree
    end
  
@@ -1070,7 +1070,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.integer "oauth_application_id"
      t.integer "status", null: false
-@@ -736,7 +736,7 @@
+@@ -737,7 +737,7 @@
      t.index ["oauth_application_id"], name: "index_clusters_applications_jupyter_on_oauth_application_id", using: :btree
    end
  
@@ -1079,7 +1079,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
-@@ -749,7 +749,7 @@
+@@ -750,7 +750,7 @@
      t.index ["cluster_id"], name: "index_clusters_applications_knative_on_cluster_id", unique: true, using: :btree
    end
  
@@ -1088,7 +1088,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.integer "status", null: false
      t.string "version", null: false
-@@ -759,7 +759,7 @@
+@@ -760,7 +760,7 @@
      t.index ["cluster_id"], name: "index_clusters_applications_prometheus_on_cluster_id", unique: true, using: :btree
    end
  
@@ -1097,7 +1097,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.integer "runner_id"
      t.integer "status", null: false
-@@ -772,7 +772,7 @@
+@@ -773,7 +773,7 @@
      t.index ["runner_id"], name: "index_clusters_applications_runners_on_runner_id", using: :btree
    end
  
@@ -1106,7 +1106,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cluster_id", null: false
      t.integer "project_id"
      t.integer "cluster_project_id"
-@@ -788,7 +788,7 @@
+@@ -789,7 +789,7 @@
      t.index ["project_id"], name: "index_clusters_kubernetes_namespaces_on_project_id", using: :btree
    end
  
@@ -1115,7 +1115,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.string "name", null: false
      t.datetime "created_at", null: false
-@@ -797,7 +797,7 @@
+@@ -798,7 +798,7 @@
      t.index ["project_id"], name: "index_container_repositories_on_project_id", using: :btree
    end
  
@@ -1124,7 +1124,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.float "leader_issues", null: false
      t.float "instance_issues", null: false
      t.float "leader_notes", null: false
-@@ -832,7 +832,7 @@
+@@ -833,7 +833,7 @@
      t.float "percentage_service_desk_issues", default: 0.0, null: false
    end
  
@@ -1133,7 +1133,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "deploy_key_id", null: false
      t.integer "project_id", null: false
      t.datetime "created_at"
-@@ -841,7 +841,7 @@
+@@ -842,7 +842,7 @@
      t.index ["project_id"], name: "index_deploy_keys_projects_on_project_id", using: :btree
    end
  
@@ -1142,7 +1142,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.boolean "revoked", default: false
      t.boolean "read_repository", default: false, null: false
      t.boolean "read_registry", default: false, null: false
-@@ -853,7 +853,7 @@
+@@ -854,7 +854,7 @@
      t.index ["token"], name: "index_deploy_tokens_on_token", unique: true, using: :btree
    end
  
@@ -1151,7 +1151,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "iid", null: false
      t.integer "project_id", null: false
      t.integer "environment_id", null: false
-@@ -879,7 +879,7 @@
+@@ -880,7 +880,7 @@
      t.index ["project_id", "status"], name: "index_deployments_on_project_id_and_status", using: :btree
    end
  
@@ -1160,7 +1160,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id", null: false
      t.string "email", null: false
      t.datetime "created_at"
-@@ -892,7 +892,7 @@
+@@ -893,7 +893,7 @@
      t.index ["user_id"], name: "index_emails_on_user_id", using: :btree
    end
  
@@ -1169,7 +1169,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.string "name", null: false
      t.datetime "created_at"
-@@ -905,7 +905,7 @@
+@@ -906,7 +906,7 @@
      t.index ["project_id", "slug"], name: "index_environments_on_project_id_and_slug", unique: true, using: :btree
    end
  
@@ -1178,7 +1178,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.integer "author_id", null: false
      t.integer "target_id"
-@@ -920,7 +920,7 @@
+@@ -921,7 +921,7 @@
      t.index ["target_type", "target_id"], name: "index_events_on_target_type_and_target_id", using: :btree
    end
  
@@ -1187,7 +1187,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "feature_key", null: false
      t.string "key", null: false
      t.string "value"
-@@ -929,14 +929,14 @@
+@@ -930,14 +930,14 @@
      t.index ["feature_key", "key", "value"], name: "index_feature_gates_on_feature_key_and_key_and_value", unique: true, using: :btree
    end
  
@@ -1204,7 +1204,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "fork_network_id", null: false
      t.integer "project_id", null: false
      t.integer "forked_from_project_id"
-@@ -945,13 +945,13 @@
+@@ -946,13 +946,13 @@
      t.index ["project_id"], name: "index_fork_network_members_on_project_id", unique: true, using: :btree
    end
  
@@ -1220,7 +1220,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "forked_to_project_id", null: false
      t.integer "forked_from_project_id", null: false
      t.datetime "created_at"
-@@ -959,7 +959,7 @@
+@@ -960,7 +960,7 @@
      t.index ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
    end
  
@@ -1229,7 +1229,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "gpg_key_id", null: false
      t.binary "keyid"
      t.binary "fingerprint"
-@@ -968,7 +968,7 @@
+@@ -969,7 +969,7 @@
      t.index ["keyid"], name: "index_gpg_key_subkeys_on_keyid", unique: true, using: :btree
    end
  
@@ -1238,7 +1238,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
      t.integer "user_id"
-@@ -980,7 +980,7 @@
+@@ -981,7 +981,7 @@
      t.index ["user_id"], name: "index_gpg_keys_on_user_id", using: :btree
    end
  
@@ -1247,7 +1247,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
      t.integer "project_id"
-@@ -998,7 +998,7 @@
+@@ -999,7 +999,7 @@
      t.index ["project_id"], name: "index_gpg_signatures_on_project_id", using: :btree
    end
  
@@ -1256,7 +1256,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
      t.integer "group_id", null: false
-@@ -1008,7 +1008,7 @@
+@@ -1009,7 +1009,7 @@
      t.index ["key", "value"], name: "index_group_custom_attributes_on_key_and_value", using: :btree
    end
  
@@ -1265,7 +1265,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "extern_uid"
      t.string "provider"
      t.integer "user_id"
-@@ -1017,7 +1017,7 @@
+@@ -1018,7 +1018,7 @@
      t.index ["user_id"], name: "index_identities_on_user_id", using: :btree
    end
  
@@ -1274,7 +1274,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.datetime_with_timezone "updated_at", null: false
      t.integer "project_id"
      t.text "import_file"
-@@ -1026,7 +1026,7 @@
+@@ -1027,7 +1027,7 @@
      t.index ["updated_at"], name: "index_import_export_uploads_on_updated_at", using: :btree
    end
  
@@ -1283,7 +1283,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.integer "usage", null: false
      t.integer "last_value", null: false
-@@ -1044,7 +1044,7 @@
+@@ -1045,7 +1045,7 @@
      t.index ["user_id"], name: "index_issue_assignees_on_user_id", using: :btree
    end
  
@@ -1292,7 +1292,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "issue_id", null: false
      t.datetime "first_mentioned_in_commit_at"
      t.datetime "first_associated_with_milestone_at"
-@@ -1054,7 +1054,7 @@
+@@ -1055,7 +1055,7 @@
      t.index ["issue_id"], name: "index_issue_metrics", using: :btree
    end
  
@@ -1301,7 +1301,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "title"
      t.integer "author_id"
      t.integer "project_id"
-@@ -1097,7 +1097,7 @@
+@@ -1098,7 +1098,7 @@
      t.index ["updated_by_id"], name: "index_issues_on_updated_by_id", where: "(updated_by_id IS NOT NULL)", using: :btree
    end
  
@@ -1310,7 +1310,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id"
      t.datetime "created_at"
      t.datetime "updated_at"
-@@ -1111,7 +1111,7 @@
+@@ -1112,7 +1112,7 @@
      t.index ["user_id"], name: "index_keys_on_user_id", using: :btree
    end
  
@@ -1319,7 +1319,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "label_id"
      t.integer "target_id"
      t.string "target_type"
-@@ -1121,7 +1121,7 @@
+@@ -1122,7 +1122,7 @@
      t.index ["target_id", "target_type"], name: "index_label_links_on_target_id_and_target_type", using: :btree
    end
  
@@ -1328,7 +1328,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "label_id", null: false
      t.integer "priority", null: false
-@@ -1132,7 +1132,7 @@
+@@ -1133,7 +1133,7 @@
      t.index ["project_id", "label_id"], name: "index_label_priorities_on_project_id_and_label_id", unique: true, using: :btree
    end
  
@@ -1337,7 +1337,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "title"
      t.string "color"
      t.integer "project_id"
-@@ -1151,7 +1151,7 @@
+@@ -1152,7 +1152,7 @@
      t.index ["type", "project_id"], name: "index_labels_on_type_and_project_id", using: :btree
    end
  
@@ -1346,7 +1346,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "user_id", null: false
      t.datetime "created_at", null: false
-@@ -1160,7 +1160,7 @@
+@@ -1161,7 +1161,7 @@
      t.index ["user_id"], name: "index_lfs_file_locks_on_user_id", using: :btree
    end
  
@@ -1355,7 +1355,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "oid", null: false
      t.bigint "size", null: false
      t.datetime "created_at"
-@@ -1171,7 +1171,7 @@
+@@ -1172,7 +1172,7 @@
      t.index ["oid"], name: "index_lfs_objects_on_oid", unique: true, using: :btree
    end
  
@@ -1364,7 +1364,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "lfs_object_id", null: false
      t.integer "project_id", null: false
      t.datetime "created_at"
-@@ -1179,7 +1179,7 @@
+@@ -1180,7 +1180,7 @@
      t.index ["project_id"], name: "index_lfs_objects_projects_on_project_id", using: :btree
    end
  
@@ -1373,7 +1373,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "board_id", null: false
      t.integer "label_id"
      t.integer "list_type", default: 1, null: false
-@@ -1191,7 +1191,7 @@
+@@ -1192,7 +1192,7 @@
      t.index ["list_type"], name: "index_lists_on_list_type", using: :btree
    end
  
@@ -1382,7 +1382,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "access_level", null: false
      t.integer "source_id", null: false
      t.string "source_type", null: false
-@@ -1254,7 +1254,7 @@
+@@ -1255,7 +1255,7 @@
      t.index ["merge_request_diff_id", "relative_order"], name: "index_merge_request_diff_files_on_mr_diff_id_and_order", unique: true, using: :btree
    end
  
@@ -1391,7 +1391,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "state"
      t.integer "merge_request_id", null: false
      t.datetime "created_at"
-@@ -1271,7 +1271,7 @@
+@@ -1272,7 +1272,7 @@
      t.index ["merge_request_id", "id"], name: "index_merge_request_diffs_on_merge_request_id_and_id_partial", where: "((NOT stored_externally) OR (stored_externally IS NULL))", using: :btree
    end
  
@@ -1400,7 +1400,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "merge_request_id", null: false
      t.datetime "latest_build_started_at"
      t.datetime "latest_build_finished_at"
-@@ -1292,7 +1292,7 @@
+@@ -1293,7 +1293,7 @@
      t.index ["pipeline_id"], name: "index_merge_request_metrics_on_pipeline_id", using: :btree
    end
  
@@ -1409,7 +1409,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "target_branch", null: false
      t.string "source_branch", null: false
      t.integer "source_project_id"
-@@ -1350,7 +1350,7 @@
+@@ -1351,7 +1351,7 @@
      t.index ["updated_by_id"], name: "index_merge_requests_on_updated_by_id", where: "(updated_by_id IS NOT NULL)", using: :btree
    end
  
@@ -1418,7 +1418,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "merge_request_id", null: false
      t.integer "issue_id", null: false
      t.datetime "created_at", null: false
-@@ -1359,7 +1359,7 @@
+@@ -1360,7 +1360,7 @@
      t.index ["merge_request_id"], name: "index_merge_requests_closing_issues_on_merge_request_id", using: :btree
    end
  
@@ -1427,7 +1427,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "title", null: false
      t.integer "project_id"
      t.text "description"
-@@ -1381,7 +1381,7 @@
+@@ -1382,7 +1382,7 @@
      t.index ["title"], name: "index_milestones_on_title_trigram", using: :gin, opclasses: {"title"=>"gin_trgm_ops"}
    end
  
@@ -1436,7 +1436,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "name", null: false
      t.string "path", null: false
      t.integer "owner_id"
-@@ -1416,7 +1416,7 @@
+@@ -1417,7 +1417,7 @@
      t.index ["type"], name: "index_namespaces_on_type", using: :btree
    end
  
@@ -1445,7 +1445,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "diff_note_id", null: false
      t.text "diff", null: false
      t.boolean "new_file", null: false
-@@ -1429,7 +1429,7 @@
+@@ -1430,7 +1430,7 @@
      t.index ["diff_note_id"], name: "index_note_diff_files_on_diff_note_id", unique: true, using: :btree
    end
  
@@ -1454,7 +1454,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.text "note"
      t.string "noteable_type"
      t.integer "author_id"
-@@ -1464,7 +1464,7 @@
+@@ -1465,7 +1465,7 @@
      t.index ["project_id", "noteable_type"], name: "index_notes_on_project_id_and_noteable_type", using: :btree
    end
  
@@ -1463,7 +1463,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id", null: false
      t.integer "source_id"
      t.string "source_type"
-@@ -1490,7 +1490,7 @@
+@@ -1491,7 +1491,7 @@
      t.index ["user_id"], name: "index_notification_settings_on_user_id", using: :btree
    end
  
@@ -1472,7 +1472,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "resource_owner_id", null: false
      t.integer "application_id", null: false
      t.string "token", null: false
-@@ -1502,7 +1502,7 @@
+@@ -1503,7 +1503,7 @@
      t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
    end
  
@@ -1481,7 +1481,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "resource_owner_id"
      t.integer "application_id"
      t.string "token", null: false
-@@ -1516,7 +1516,7 @@
+@@ -1517,7 +1517,7 @@
      t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
    end
  
@@ -1490,7 +1490,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "name", null: false
      t.string "uid", null: false
      t.string "secret", null: false
-@@ -1531,13 +1531,13 @@
+@@ -1532,13 +1532,13 @@
      t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
    end
  
@@ -1506,7 +1506,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.text "certificate"
      t.text "encrypted_key"
-@@ -1554,7 +1554,7 @@
+@@ -1555,7 +1555,7 @@
      t.index ["verified_at"], name: "index_pages_domains_on_verified_at", using: :btree
    end
  
@@ -1515,7 +1515,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id", null: false
      t.string "name", null: false
      t.boolean "revoked", default: false
-@@ -1568,7 +1568,7 @@
+@@ -1569,7 +1569,7 @@
      t.index ["user_id"], name: "index_personal_access_tokens_on_user_id", using: :btree
    end
  
@@ -1524,7 +1524,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "shard_id", null: false
      t.string "disk_path"
      t.string "state"
-@@ -1578,7 +1578,7 @@
+@@ -1579,7 +1579,7 @@
      t.index ["source_project_id"], name: "index_pool_repositories_on_source_project_id", unique: true, using: :btree
    end
  
@@ -1533,7 +1533,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "name", null: false
      t.string "color", null: false
      t.datetime_with_timezone "created_at", null: false
-@@ -1593,7 +1593,7 @@
+@@ -1594,7 +1594,7 @@
      t.index ["user_id", "project_id", "access_level"], name: "index_project_authorizations_on_user_id_project_id_access_level", unique: true, using: :btree
    end
  
@@ -1542,7 +1542,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
-@@ -1627,7 +1627,7 @@
+@@ -1628,7 +1628,7 @@
      t.index ["project_id", "date"], name: "index_project_daily_statistics_on_project_id_and_date", unique: true, order: { date: :desc }, using: :btree
    end
  
@@ -1551,7 +1551,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "deploy_token_id", null: false
      t.datetime_with_timezone "created_at", null: false
-@@ -1635,7 +1635,7 @@
+@@ -1636,7 +1636,7 @@
      t.index ["project_id", "deploy_token_id"], name: "index_project_deploy_tokens_on_project_id_and_deploy_token_id", unique: true, using: :btree
    end
  
@@ -1560,7 +1560,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.boolean "enabled", default: false, null: false
      t.string "api_url"
      t.string "encrypted_token"
-@@ -1644,7 +1644,7 @@
+@@ -1645,7 +1645,7 @@
      t.string "organization_name"
    end
  
@@ -1569,7 +1569,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "merge_requests_access_level"
      t.integer "issues_access_level"
-@@ -1658,7 +1658,7 @@
+@@ -1659,7 +1659,7 @@
      t.index ["project_id"], name: "index_project_features_on_project_id", unique: true, using: :btree
    end
  
@@ -1578,7 +1578,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "group_id", null: false
      t.datetime "created_at"
-@@ -1669,7 +1669,7 @@
+@@ -1670,7 +1670,7 @@
      t.index ["project_id"], name: "index_project_group_links_on_project_id", using: :btree
    end
  
@@ -1587,7 +1587,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.text "data"
      t.text "encrypted_credentials"
-@@ -1678,7 +1678,7 @@
+@@ -1679,7 +1679,7 @@
      t.index ["project_id"], name: "index_project_import_data_on_project_id", using: :btree
    end
  
@@ -1596,7 +1596,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.string "status"
      t.string "jid"
-@@ -1688,7 +1688,7 @@
+@@ -1689,7 +1689,7 @@
      t.index ["status"], name: "index_project_mirror_data_on_status", using: :btree
    end
  
@@ -1605,7 +1605,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "shard_id", null: false
      t.string "disk_path", null: false
      t.integer "project_id", null: false
-@@ -1697,7 +1697,7 @@
+@@ -1698,7 +1698,7 @@
      t.index ["shard_id"], name: "index_project_repositories_on_shard_id", using: :btree
    end
  
@@ -1614,7 +1614,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "namespace_id", null: false
      t.bigint "commit_count", default: 0, null: false
-@@ -1709,7 +1709,7 @@
+@@ -1710,7 +1710,7 @@
      t.index ["project_id"], name: "index_project_statistics_on_project_id", unique: true, using: :btree
    end
  
@@ -1623,7 +1623,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "name"
      t.string "path"
      t.text "description"
-@@ -1789,7 +1789,7 @@
+@@ -1790,7 +1790,7 @@
      t.index ["visibility_level"], name: "index_projects_on_visibility_level", using: :btree
    end
  
@@ -1632,7 +1632,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.string "title", null: false
      t.string "query", null: false
-@@ -1807,7 +1807,7 @@
+@@ -1808,7 +1808,7 @@
      t.index ["project_id"], name: "index_prometheus_metrics_on_project_id", using: :btree
    end
  
@@ -1641,7 +1641,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "protected_branch_id", null: false
      t.integer "access_level", default: 40, null: false
      t.datetime "created_at", null: false
-@@ -1815,7 +1815,7 @@
+@@ -1816,7 +1816,7 @@
      t.index ["protected_branch_id"], name: "index_protected_branch_merge_access", using: :btree
    end
  
@@ -1650,7 +1650,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "protected_branch_id", null: false
      t.integer "access_level", default: 40, null: false
      t.datetime "created_at", null: false
-@@ -1823,7 +1823,7 @@
+@@ -1824,7 +1824,7 @@
      t.index ["protected_branch_id"], name: "index_protected_branch_push_access", using: :btree
    end
  
@@ -1659,7 +1659,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.string "name", null: false
      t.datetime "created_at"
-@@ -1831,7 +1831,7 @@
+@@ -1832,7 +1832,7 @@
      t.index ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
    end
  
@@ -1668,7 +1668,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "protected_tag_id", null: false
      t.integer "access_level", default: 40
      t.integer "user_id"
-@@ -1843,7 +1843,7 @@
+@@ -1844,7 +1844,7 @@
      t.index ["user_id"], name: "index_protected_tag_create_access_levels_on_user_id", using: :btree
    end
  
@@ -1677,7 +1677,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.string "name", null: false
      t.datetime "created_at", null: false
-@@ -1864,7 +1864,7 @@
+@@ -1865,7 +1865,7 @@
      t.index ["event_id"], name: "index_push_event_payloads_on_event_id", unique: true, using: :btree
    end
  
@@ -1686,7 +1686,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "source_id", null: false
      t.string "source_type", null: false
      t.string "path", null: false
-@@ -1874,7 +1874,7 @@
+@@ -1875,7 +1875,7 @@
      t.index ["source_type", "source_id"], name: "index_redirect_routes_on_source_type_and_source_id", using: :btree
    end
  
@@ -1695,7 +1695,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "release_id", null: false
      t.string "url", null: false
      t.string "name", null: false
-@@ -1884,7 +1884,7 @@
+@@ -1885,7 +1885,7 @@
      t.index ["release_id", "url"], name: "index_release_links_on_release_id_and_url", unique: true, using: :btree
    end
  
@@ -1704,7 +1704,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "tag"
      t.text "description"
      t.integer "project_id"
-@@ -1900,7 +1900,7 @@
+@@ -1901,7 +1901,7 @@
      t.index ["project_id"], name: "index_releases_on_project_id", using: :btree
    end
  
@@ -1713,7 +1713,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.string "url"
      t.boolean "enabled", default: false
-@@ -1928,7 +1928,7 @@
+@@ -1929,7 +1929,7 @@
      t.index ["project_id", "programming_language_id"], name: "index_repository_languages_on_project_and_languages_id", unique: true, using: :btree
    end
  
@@ -1722,7 +1722,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "action", null: false
      t.integer "issue_id"
      t.integer "merge_request_id"
-@@ -1944,7 +1944,7 @@
+@@ -1945,7 +1945,7 @@
      t.index ["user_id"], name: "index_resource_label_events_on_user_id", using: :btree
    end
  
@@ -1731,7 +1731,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "source_id", null: false
      t.string "source_type", null: false
      t.string "path", null: false
-@@ -1956,7 +1956,7 @@
+@@ -1957,7 +1957,7 @@
      t.index ["source_type", "source_id"], name: "index_routes_on_source_type_and_source_id", unique: true, using: :btree
    end
  
@@ -1740,7 +1740,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id"
      t.integer "noteable_id"
      t.string "noteable_type"
-@@ -1970,7 +1970,7 @@
+@@ -1971,7 +1971,7 @@
      t.index ["reply_key"], name: "index_sent_notifications_on_reply_key", unique: true, using: :btree
    end
  
@@ -1749,7 +1749,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "type"
      t.string "title"
      t.integer "project_id"
-@@ -1997,12 +1997,12 @@
+@@ -1998,12 +1998,12 @@
      t.index ["type"], name: "index_services_on_type", using: :btree
    end
  
@@ -1764,7 +1764,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "title"
      t.text "content"
      t.integer "author_id", null: false
-@@ -2025,7 +2025,7 @@
+@@ -2026,7 +2026,7 @@
      t.index ["visibility_level"], name: "index_snippets_on_visibility_level", using: :btree
    end
  
@@ -1773,7 +1773,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id"
      t.string "source_ip"
      t.string "user_agent"
-@@ -2039,7 +2039,7 @@
+@@ -2040,7 +2040,7 @@
      t.boolean "recaptcha_verified", default: false, null: false
    end
  
@@ -1782,7 +1782,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id"
      t.integer "subscribable_id"
      t.string "subscribable_type"
-@@ -2051,7 +2051,7 @@
+@@ -2052,7 +2052,7 @@
      t.index ["subscribable_id", "subscribable_type", "user_id", "project_id"], name: "index_subscriptions_on_subscribable_and_user_id_and_project_id", unique: true, using: :btree
    end
  
@@ -1791,7 +1791,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "note_id", null: false
      t.integer "relative_order", limit: 2, null: false
      t.boolean "applied", default: false, null: false
-@@ -2064,7 +2064,7 @@
+@@ -2065,7 +2065,7 @@
      t.index ["note_id", "relative_order"], name: "index_suggestions_on_note_id_and_relative_order", unique: true, using: :btree
    end
  
@@ -1800,7 +1800,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "note_id", null: false
      t.integer "commit_count"
      t.string "action"
-@@ -2073,7 +2073,7 @@
+@@ -2074,7 +2074,7 @@
      t.index ["note_id"], name: "index_system_note_metadata_on_note_id", unique: true, using: :btree
    end
  
@@ -1809,7 +1809,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "tag_id"
      t.integer "taggable_id"
      t.string "taggable_type"
-@@ -2105,7 +2105,7 @@
+@@ -2106,7 +2106,7 @@
      t.index ["user_id"], name: "index_term_agreements_on_user_id", using: :btree
    end
  
@@ -1818,7 +1818,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "time_spent", null: false
      t.integer "user_id"
      t.datetime "created_at", null: false
-@@ -2118,7 +2118,7 @@
+@@ -2119,7 +2119,7 @@
      t.index ["user_id"], name: "index_timelogs_on_user_id", using: :btree
    end
  
@@ -1827,7 +1827,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id", null: false
      t.integer "project_id"
      t.integer "target_id"
-@@ -2142,12 +2142,12 @@
+@@ -2143,12 +2143,12 @@
      t.index ["user_id"], name: "index_todos_on_user_id", using: :btree
    end
  
@@ -1842,7 +1842,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.text "certificate"
      t.string "key_handle"
      t.string "public_key"
-@@ -2160,7 +2160,7 @@
+@@ -2161,7 +2161,7 @@
      t.index ["user_id"], name: "index_u2f_registrations_on_user_id", using: :btree
    end
  
@@ -1851,7 +1851,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.bigint "size", null: false
      t.string "path", limit: 511, null: false
      t.string "checksum", limit: 64
-@@ -2177,7 +2177,7 @@
+@@ -2178,7 +2178,7 @@
      t.index ["uploader", "path"], name: "index_uploads_on_uploader_and_path", using: :btree
    end
  
@@ -1860,7 +1860,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "user_agent", null: false
      t.string "ip_address", null: false
      t.integer "subject_id", null: false
-@@ -2188,14 +2188,14 @@
+@@ -2189,14 +2189,14 @@
      t.index ["subject_id", "subject_type"], name: "index_user_agent_details_on_subject_id_and_subject_type", using: :btree
    end
  
@@ -1877,7 +1877,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.datetime_with_timezone "created_at", null: false
      t.datetime_with_timezone "updated_at", null: false
      t.integer "user_id", null: false
-@@ -2212,7 +2212,7 @@
+@@ -2213,7 +2213,7 @@
      t.index ["user_id"], name: "index_user_interacted_projects_on_user_id", using: :btree
    end
  
@@ -1886,7 +1886,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "user_id", null: false
      t.integer "issue_notes_filter", limit: 2, default: 0, null: false
      t.integer "merge_request_notes_filter", limit: 2, default: 0, null: false
-@@ -2224,7 +2224,7 @@
+@@ -2225,7 +2225,7 @@
      t.index ["user_id"], name: "index_user_preferences_on_user_id", unique: true, using: :btree
    end
  
@@ -1895,7 +1895,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "cached_markdown_version"
      t.string "emoji", default: "speech_balloon", null: false
      t.string "message", limit: 100
-@@ -2232,7 +2232,7 @@
+@@ -2233,7 +2233,7 @@
      t.index ["user_id"], name: "index_user_statuses_on_user_id", using: :btree
    end
  
@@ -1904,7 +1904,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.boolean "name_synced", default: false
      t.boolean "email_synced", default: false
      t.boolean "location_synced", default: false
-@@ -2241,7 +2241,7 @@
+@@ -2242,7 +2242,7 @@
      t.index ["user_id"], name: "index_user_synced_attributes_metadata_on_user_id", unique: true, using: :btree
    end
  
@@ -1913,7 +1913,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.string "email", default: "", null: false
      t.string "encrypted_password", default: "", null: false
      t.string "reset_password_token"
-@@ -2327,7 +2327,7 @@
+@@ -2328,7 +2328,7 @@
      t.index ["username"], name: "index_users_on_username_trigram", using: :gin, opclasses: {"username"=>"gin_trgm_ops"}
    end
  
@@ -1922,7 +1922,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "project_id", null: false
      t.integer "user_id", null: false
      t.datetime "created_at"
-@@ -2336,7 +2336,7 @@
+@@ -2337,7 +2337,7 @@
      t.index ["user_id", "project_id"], name: "index_users_star_projects_on_user_id_and_project_id", unique: true, using: :btree
    end
  
@@ -1931,7 +1931,7 @@ Model.new.attributes now also returns encrypted attributes.
      t.integer "web_hook_id", null: false
      t.string "trigger"
      t.string "url"
-@@ -2353,7 +2353,7 @@
+@@ -2354,7 +2354,7 @@
      t.index ["web_hook_id"], name: "index_web_hook_logs_on_web_hook_id", using: :btree
    end
  
@@ -1966,16 +1966,16 @@ Model.new.attributes now also returns encrypted attributes.
      end
      # rubocop: enable CodeReuse/ActiveRecord
  
-@@ -121,7 +121,7 @@
-     def milestones
-       milestones = Milestone.where(project_id: project_ids_relation)
-       milestones = milestones.search(query)
+@@ -123,7 +123,7 @@
+ 
+       milestones = filter_milestones_by_project(milestones)
+ 
 -      milestones.reorder('updated_at DESC')
 +      milestones.reorder('milestones.updated_at DESC')
      end
      # rubocop: enable CodeReuse/ActiveRecord
  
-@@ -139,7 +139,7 @@
+@@ -141,7 +141,7 @@
            merge_requests.full_search(query)
          end