From 349eadccb8751c13d150b367955f270dd78cb6ef Mon Sep 17 00:00:00 2001 From: kalabro Date: Thu, 29 Mar 2018 14:36:41 +0300 Subject: [PATCH] Properly update composer.lock files. --- backend-donations/composer.lock | 8 +-- backend-gifts/composer.lock | 8 +-- .../web/sites/default/default.settings.php | 56 ++----------------- 3 files changed, 12 insertions(+), 60 deletions(-) diff --git a/backend-donations/composer.lock b/backend-donations/composer.lock index 3f6d699..a353739 100644 --- a/backend-donations/composer.lock +++ b/backend-donations/composer.lock @@ -2592,12 +2592,12 @@ "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "68d25c07b7306340900abc4020c38683a817f0eb" + "reference": "f439a43c7da1df8d16067f797c0bc3498eb4c699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/68d25c07b7306340900abc4020c38683a817f0eb", - "reference": "68d25c07b7306340900abc4020c38683a817f0eb", + "url": "https://api.github.com/repos/drupal/core/zipball/f439a43c7da1df8d16067f797c0bc3498eb4c699", + "reference": "f439a43c7da1df8d16067f797c0bc3498eb4c699", "shasum": "" }, "require": { @@ -2772,7 +2772,7 @@ "GPL-2.0+" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2017-11-03T13:20:16+00:00" + "time": "2018-03-27T10:03:10+00:00" }, { "name": "drupal/csv_serialization", diff --git a/backend-gifts/composer.lock b/backend-gifts/composer.lock index 0794d90..1dd1b39 100644 --- a/backend-gifts/composer.lock +++ b/backend-gifts/composer.lock @@ -1984,12 +1984,12 @@ "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "68d25c07b7306340900abc4020c38683a817f0eb" + "reference": "f439a43c7da1df8d16067f797c0bc3498eb4c699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/68d25c07b7306340900abc4020c38683a817f0eb", - "reference": "68d25c07b7306340900abc4020c38683a817f0eb", + "url": "https://api.github.com/repos/drupal/core/zipball/f439a43c7da1df8d16067f797c0bc3498eb4c699", + "reference": "f439a43c7da1df8d16067f797c0bc3498eb4c699", "shasum": "" }, "require": { @@ -2164,7 +2164,7 @@ "GPL-2.0+" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2017-11-03T13:20:16+00:00" + "time": "2018-03-27T10:03:10+00:00" }, { "name": "drupal/default_content", diff --git a/backend-gifts/web/sites/default/default.settings.php b/backend-gifts/web/sites/default/default.settings.php index 14a4422..c7dd194 100644 --- a/backend-gifts/web/sites/default/default.settings.php +++ b/backend-gifts/web/sites/default/default.settings.php @@ -86,9 +86,7 @@ * ); * @endcode */ -$databases = array( - -); +$databases = array(); /** * Customizing database settings. @@ -251,9 +249,7 @@ * ); * @endcode */ -$config_directories = array( - -); +$config_directories = array(); /** * Settings: @@ -280,7 +276,6 @@ * service requires the install profile use the 'install_profile' container * parameter. Functional code can use \Drupal::installProfile(). */ - # $settings['install_profile'] = ''; /** @@ -310,7 +305,6 @@ * custom code that changes the container, changing this identifier will also * allow the container to be invalidated as soon as code is deployed. */ - # $settings['deployment_identifier'] = \Drupal::VERSION; /** @@ -342,11 +336,8 @@ * You can also define an array of host names that can be accessed directly, * bypassing the proxy, in $settings['http_client_config']['proxy']['no']. */ - # $settings['http_client_config']['proxy']['http'] = 'http://proxy_user:proxy_pass@example.com:8080'; - # $settings['http_client_config']['proxy']['https'] = 'http://proxy_user:proxy_pass@example.com:8080'; - # $settings['http_client_config']['proxy']['no'] = ['127.0.0.1', 'localhost']; /** @@ -380,49 +371,42 @@ * Be aware, however, that it is likely that this would allow IP * address spoofing unless more advanced precautions are taken. */ - # $settings['reverse_proxy'] = TRUE; /** * Specify every reverse proxy IP address in your environment. * This setting is required if $settings['reverse_proxy'] is TRUE. */ - # $settings['reverse_proxy_addresses'] = array('a.b.c.d', ...); /** * Set this value if your proxy server sends the client IP in a header * other than X-Forwarded-For. */ - # $settings['reverse_proxy_header'] = 'X_CLUSTER_CLIENT_IP'; /** * Set this value if your proxy server sends the client protocol in a header * other than X-Forwarded-Proto. */ - # $settings['reverse_proxy_proto_header'] = 'X_FORWARDED_PROTO'; /** * Set this value if your proxy server sends the client protocol in a header * other than X-Forwarded-Host. */ - # $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST'; /** * Set this value if your proxy server sends the client protocol in a header * other than X-Forwarded-Port. */ - # $settings['reverse_proxy_port_header'] = 'X_FORWARDED_PORT'; /** * Set this value if your proxy server sends the client protocol in a header * other than Forwarded. */ - # $settings['reverse_proxy_forwarded_header'] = 'FORWARDED'; /** @@ -441,9 +425,9 @@ * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid * getting cached pages from the proxy. */ - # $settings['omit_vary_cookie'] = TRUE; + /** * Cache TTL for client error (4xx) responses. * @@ -454,7 +438,6 @@ * of client error responses set the value to 0. Currently applies only to * page_cache module. */ - # $settings['cache_ttl_4xx'] = 3600; /** @@ -465,7 +448,6 @@ * * @see \Drupal\Core\Form\FormCache::setCache() */ - # $settings['form_cache_expiration'] = 21600; /** @@ -475,7 +457,6 @@ * performance reasons. Detection can be prevented by setting * class_loader_auto_detect to false, as in the example below. */ - # $settings['class_loader_auto_detect'] = FALSE; /* @@ -490,7 +471,6 @@ * example, to use Symfony's APC class loader without automatic detection, * uncomment the code below. */ - /* if ($settings['hash_salt']) { $prefix = 'drupal.' . hash('sha256', 'drupal.' . $settings['hash_salt']); @@ -524,7 +504,6 @@ * * Remove the leading hash signs to disable. */ - # $settings['allow_authorize_operations'] = FALSE; /** @@ -532,9 +511,7 @@ * * Value should be in PHP Octal Notation, with leading zero. */ - # $settings['file_chmod_directory'] = 0775; - # $settings['file_chmod_file'] = 0664; /** @@ -548,7 +525,6 @@ * security by serving user-uploaded files from a different domain or subdomain * pointing to the same server. Do not include a trailing slash. */ - # $settings['file_public_base_url'] = 'http://downloads.example.com/files'; /** @@ -558,7 +534,6 @@ * must exist and be writable by Drupal. This directory must be relative to * the Drupal installation directory and be accessible over the web. */ - # $settings['file_public_path'] = 'sites/default/files'; /** @@ -574,7 +549,6 @@ * See https://www.drupal.org/documentation/modules/file for more information * about securing private files. */ - # $settings['file_private_path'] = ''; /** @@ -583,7 +557,6 @@ * Set the minimum interval between each session write to database. * For performance reasons it defaults to 180. */ - # $settings['session_write_interval'] = 180; /** @@ -598,13 +571,9 @@ * The "en" part of the variable name, is dynamic and can be any langcode of * any added language. (eg locale_custom_strings_de for german). */ - # $settings['locale_custom_strings_en'][''] = array( - # 'forum' => 'Discussion board', - # '@count min' => '@count minutes', - # ); /** @@ -617,7 +586,6 @@ * * Note: This setting does not apply to installation and update pages. */ - # $settings['maintenance_theme'] = 'bartik'; /** @@ -640,9 +608,7 @@ * and increase the limits of these variables. For more information, see * http://php.net/manual/pcre.configuration.php. */ - # ini_set('pcre.backtrack_limit', 200000); - # ini_set('pcre.recursion_limit', 200000); /** @@ -662,7 +628,6 @@ * override in a services.yml file in the same directory as settings.php * (definitions in this file will override service definition defaults). */ - # $settings['bootstrap_config_storage'] = array('Drupal\Core\Config\BootstrapConfigStorageFactory', 'getFileStorage'); /** @@ -687,13 +652,9 @@ * configuration values in settings.php will not fire any of the configuration * change events. */ - # $config['system.file']['path']['temporary'] = '/tmp'; - # $config['system.site']['name'] = 'My Drupal site'; - # $config['system.theme']['default'] = 'stark'; - # $config['user.settings']['anonymous'] = 'Visitor'; /** @@ -719,11 +680,8 @@ * * Remove the leading hash signs if you would like to alter this functionality. */ - # $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)|(?:system\/files)\//'; - # $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'; - # $config['system.performance']['fast_404']['html'] = '404 Not Found

Not Found

The requested URL "@path" was not found on this server.

'; /** @@ -738,7 +696,6 @@ * tracking purposes, for testing a service container with an error condition or * to test a service container that throws an exception. */ - # $settings['container_base_class'] = '\Drupal\Core\DependencyInjection\Container'; /** @@ -748,7 +705,6 @@ * alternate implementation YAML parser. The class must implement the * \Drupal\Component\Serialization\SerializationInterface interface. */ - # $settings['yaml_parser_class'] = NULL; /** @@ -823,11 +779,7 @@ * * Keep this code block at the end of this file to take full effect. */ - # - # if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { - # include $app_root . '/' . $site_path . '/settings.local.php'; - -# } \ No newline at end of file +# }