diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-01-04 23:38:13 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-04 23:38:13 +0100 |
| commit | 9c9f7dc639768a0d6b930ec11c050a1333df934e (patch) | |
| tree | 7a54287bb3e8eec9a57223bdace347de72beb936 /config | |
| parent | 6fb4a533b74c861a1e533604da462efb6d309de0 (diff) | |
| parent | 6f1b4dc76b4619f538b7216ad3a10ca9336d0c2b (diff) | |
| download | gitlab-ce-9c9f7dc639768a0d6b930ec11c050a1333df934e.tar.gz | |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/active_record_data_types.rb | 5 | ||||
| -rw-r--r-- | config/initializers/asset_sync.rb | 4 | ||||
| -rw-r--r-- | config/routes/project.rb | 4 |
3 files changed, 9 insertions, 4 deletions
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 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') diff --git a/config/routes/project.rb b/config/routes/project.rb index 905c906b194..d780a7f4b9a 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 |