Skip to content

Commit

Permalink
Update to drupal 8.0.0-rc1. For more information, see https://www.dru…
Browse files Browse the repository at this point in the history
  • Loading branch information
greg-1-anderson committed Oct 8, 2015
1 parent eb34d13 commit f32e58e
Show file tree
Hide file tree
Showing 8,476 changed files with 210,049 additions and 168,443 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
core/assets/vendor/**/*
core/modules/locale/tests/locale_test.js
core/vendor/**/*
vendor/**/*
sites/**/files/**/*
libraries/**/*
sites/**/libraries/**/*
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@
*.png -text diff
*.phar -text diff
*.exe -text diff
*.ttf -text diff
7 changes: 1 addition & 6 deletions autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,11 @@
* @file
* Includes the autoloader created by Composer.
*
* This file can be edited to change the autoloader if you are managing a
* project's dependencies using Composer. If Drupal code requires the
* autoloader, it should always be loaded using this file so that projects
* using Composer continue to work.
*
* @see composer.json
* @see index.php
* @see core/install.php
* @see core/rebuild.php
* @see core/modules/statistics/statistics.php
*/

return require __DIR__ . '/core/vendor/autoload.php';
return require __DIR__ . '/vendor/autoload.php';
26 changes: 23 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"type": "project",
"license": "GPL-2.0+",
"require": {
"composer/installers": "^1.0.20",
"composer/installers": "^1.0.21",
"wikimedia/composer-merge-plugin": "^1.3.0"
},
"replace": {
"drupal/core": "~8.0"
},
"minimum-stability": "dev",
Expand All @@ -15,8 +18,25 @@
},
"extra": {
"_readme": [
"By default Drupal loads the autoloader from ./core/vendor/autoload.php.",
"By default Drupal loads the autoloader from ./vendor/autoload.php.",
"To change the autoloader you can edit ./autoload.php."
]
],
"merge-plugin": {
"include": [
"core/composer.json"
],
"recurse": false,
"replace": false,
"merge-extra": false
}
},
"autoload": {
"psr-4": {
"Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer"
}
},
"scripts": {
"pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
"post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
}
}
Loading

0 comments on commit f32e58e

Please sign in to comment.