From d2ebc9b931d12cb2cb120d6f7c940744bc1be39c Mon Sep 17 00:00:00 2001 From: James Edwards-Jones Date: Thu, 19 Oct 2017 17:47:11 +0300 Subject: Prevent schema.rb reverting from datetime_with_timezone to datetime --- config/initializers/active_record_data_types.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/active_record_data_types.rb index fef591c397d..0359e14b232 100644 --- a/config/initializers/active_record_data_types.rb +++ b/config/initializers/active_record_data_types.rb @@ -79,3 +79,8 @@ elsif Gitlab::Database.mysql? NATIVE_DATABASE_TYPES[:datetime_with_timezone] = { name: 'timestamp' } end end + +# Ensure `datetime_with_timezone` columns are correctly written to schema.rb +if (ActiveRecord::Base.connection.active? rescue false) + ActiveRecord::Base.connection.send :reload_type_map +end -- cgit v1.2.3 From f88d5974bbc3646587a9c15e9054e63fdb746a20 Mon Sep 17 00:00:00 2001 From: Mario de la Ossa Date: Tue, 19 Dec 2017 15:24:36 -0600 Subject: Add pause/resume button to specific project runners --- config/routes/project.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 239b5480321..c3ad53a387f 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -383,8 +383,8 @@ constraints(ProjectUrlConstrainer.new) do resources :runners, only: [:index, :edit, :update, :destroy, :show] do member do - get :resume - get :pause + post :resume + post :pause end collection do -- cgit v1.2.3 From 9131fb560f2d4232d4b4890baef4d926ad35a6f8 Mon Sep 17 00:00:00 2001 From: "Balasankar \"Balu\" C" Date: Thu, 28 Dec 2017 20:10:39 +0530 Subject: Rename asset sync related AWS variables --- config/initializers/asset_sync.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/initializers/asset_sync.rb b/config/initializers/asset_sync.rb index db8500f6231..7f3934853fa 100644 --- a/config/initializers/asset_sync.rb +++ b/config/initializers/asset_sync.rb @@ -14,8 +14,8 @@ AssetSync.configure do |config| config.fog_directory = ENV['FOG_DIRECTORY'] if ENV.has_key?('FOG_DIRECTORY') config.fog_region = ENV['FOG_REGION'] if ENV.has_key?('FOG_REGION') - config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID'] if ENV.has_key?('AWS_ACCESS_KEY_ID') - config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] if ENV.has_key?('AWS_SECRET_ACCESS_KEY') + config.aws_access_key_id = ENV['ASSETS_AWS_ACCESS_KEY_ID'] if ENV.has_key?('ASSETS_AWS_ACCESS_KEY_ID') + config.aws_secret_access_key = ENV['ASSETS_AWS_SECRET_ACCESS_KEY'] if ENV.has_key?('ASSETS_AWS_SECRET_ACCESS_KEY') config.aws_reduced_redundancy = ENV['AWS_REDUCED_REDUNDANCY'] == true if ENV.has_key?('AWS_REDUCED_REDUNDANCY') config.rackspace_username = ENV['RACKSPACE_USERNAME'] if ENV.has_key?('RACKSPACE_USERNAME') -- cgit v1.2.3