Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Brandl <abrandl@gitlab.com>2019-04-05 16:02:56 +0300
committerAndreas Brandl <abrandl@gitlab.com>2019-04-05 16:02:56 +0300
commit46b1b9c1d61c269588bd3cd4203420608ddd7f0b (patch)
treea877f5366d3367e1264e96f3f5e8a4b23bdbd62a /db/migrate
parent7a48a06cf3b454021aa466464686fee8c82d6862 (diff)
Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
Diffstat (limited to 'db/migrate')
-rw-r--r--db/migrate/20171211131502_add_external_classification_authorization_settings_to_appliction_settings.rb29
-rw-r--r--db/migrate/20171218140451_add_external_authorization_service_classification_label_to_projects.rb11
-rw-r--r--db/migrate/20180314100728_add_external_authorization_service_timeout_to_application_settings.rb18
-rw-r--r--db/migrate/20180315160435_add_external_auth_mutual_tls_fields_to_project_settings.rb16
4 files changed, 0 insertions, 74 deletions
diff --git a/db/migrate/20171211131502_add_external_classification_authorization_settings_to_appliction_settings.rb b/db/migrate/20171211131502_add_external_classification_authorization_settings_to_appliction_settings.rb
deleted file mode 100644
index a7dec8732fb..00000000000
--- a/db/migrate/20171211131502_add_external_classification_authorization_settings_to_appliction_settings.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class AddExternalClassificationAuthorizationSettingsToApplictionSettings < ActiveRecord::Migration[4.2]
- include Gitlab::Database::MigrationHelpers
-
- DOWNTIME = false
-
- disable_ddl_transaction!
-
- def up
- add_column_with_default :application_settings,
- :external_authorization_service_enabled,
- :boolean,
- default: false
- add_column :application_settings,
- :external_authorization_service_url,
- :string
- add_column :application_settings,
- :external_authorization_service_default_label,
- :string
- end
-
- def down
- remove_column :application_settings,
- :external_authorization_service_default_label
- remove_column :application_settings,
- :external_authorization_service_url
- remove_column :application_settings,
- :external_authorization_service_enabled
- end
-end
diff --git a/db/migrate/20171218140451_add_external_authorization_service_classification_label_to_projects.rb b/db/migrate/20171218140451_add_external_authorization_service_classification_label_to_projects.rb
deleted file mode 100644
index 7b83580f025..00000000000
--- a/db/migrate/20171218140451_add_external_authorization_service_classification_label_to_projects.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddExternalAuthorizationServiceClassificationLabelToProjects < ActiveRecord::Migration[4.2]
- include Gitlab::Database::MigrationHelpers
-
- DOWNTIME = false
-
- def change
- add_column :projects,
- :external_authorization_classification_label,
- :string
- end
-end
diff --git a/db/migrate/20180314100728_add_external_authorization_service_timeout_to_application_settings.rb b/db/migrate/20180314100728_add_external_authorization_service_timeout_to_application_settings.rb
deleted file mode 100644
index c3c6aa0ddf8..00000000000
--- a/db/migrate/20180314100728_add_external_authorization_service_timeout_to_application_settings.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class AddExternalAuthorizationServiceTimeoutToApplicationSettings < ActiveRecord::Migration[4.2]
- include Gitlab::Database::MigrationHelpers
-
- DOWNTIME = false
-
- def up
- # We can use the regular `add_column` with a default since `application_settings`
- # is a small table.
- add_column :application_settings,
- :external_authorization_service_timeout,
- :float,
- default: 0.5
- end
-
- def down
- remove_column :application_settings, :external_authorization_service_timeout
- end
-end
diff --git a/db/migrate/20180315160435_add_external_auth_mutual_tls_fields_to_project_settings.rb b/db/migrate/20180315160435_add_external_auth_mutual_tls_fields_to_project_settings.rb
deleted file mode 100644
index ee3d1078f5e..00000000000
--- a/db/migrate/20180315160435_add_external_auth_mutual_tls_fields_to_project_settings.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class AddExternalAuthMutualTlsFieldsToProjectSettings < ActiveRecord::Migration[4.2]
- DOWNTIME = false
-
- def change
- add_column :application_settings,
- :external_auth_client_cert, :text
- add_column :application_settings,
- :encrypted_external_auth_client_key, :text
- add_column :application_settings,
- :encrypted_external_auth_client_key_iv, :string
- add_column :application_settings,
- :encrypted_external_auth_client_key_pass, :string
- add_column :application_settings,
- :encrypted_external_auth_client_key_pass_iv, :string
- end
-end