Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Copy the editor config and gitattributes from drupal to the root. #404

Merged
merged 1 commit into from
Jun 26, 2018
Merged

Copy the editor config and gitattributes from drupal to the root. #404

merged 1 commit into from
Jun 26, 2018

Conversation

rodrigoaguilera
Copy link
Contributor

No description provided.

@weitzman
Copy link
Contributor

Seems reasonable to me. I dont know whats up with the tests. I'm gonna rerun them.

@webflo
Copy link
Member

webflo commented Jun 26, 2018

I try to fix the tests in #405. I made some good progress on PHP 5.6 but struggle with symfony deprecation helper in tests.

@webflo
Copy link
Member

webflo commented Jun 26, 2018

👍

@webflo webflo merged commit 3be2be5 into drupal-composer:8.x Jun 26, 2018
@webflo
Copy link
Member

webflo commented Jun 26, 2018

Thanks!

@rodrigoaguilera
Copy link
Contributor Author

Thank you for such a great effort on maintaining this project 😃

I think this is also useful to show that drupal-scaffold can also be configured.

daften pushed a commit to district09/drupal8_project_template that referenced this pull request Aug 9, 2018
Merge remote-tracking branch 'upstream/8.x' into 8.x
25a97be 
* upstream/8.x: (22 commits)
  Remove unused use statement. (drupal-composer#406)
  Fix typo in README.md
  Remove "drupal-scaffold" from scripts (drupal-composer#275)
  Copy the editor config and gitattributes from drupal to the root. (drupal-composer#404)
  Fix tests on Travis CI (drupal-composer#405)
  Update drupal-composer/drupal-scaffold
  Fix installer path for drush commandfiles.
  Bump minimal version to 8.5.3
  Bump minimal version
  Updated argument name
  Remove extra whitespace (drupal-composer#371)
  Honor .env files and suggest usage (drupal-composer#351)
  Improve update instructions (drupal-composer#366)
  Run tests with 8.6.x
  Update to Drupal 8.5
  Add platform version to FAQ to help user specifying PHP version, fixes drupal-composer#359. (drupal-composer#360)
  Update /drush dir for Drush9 (drupal-composer#350)
  Revert "Update /drush dir for Drush9"
  Update /drush dir for Drush9
  Replace require-dev with webflo/drupal-core-require-dev (drupal-composer#348)
  ...

# Conflicts:
#	.gitignore
#	composer.json
#	drush/policy.drush.inc
Natkeeran pushed a commit to islandora-deprecated/drupal-project that referenced this pull request Sep 17, 2018
@dannylamb @Natkeeran
Drupal 8.6 (#23)
51a5785 
* Honor .env files and suggest usage (drupal-composer#351)

* Remove extra whitespace (drupal-composer#371)

* Updated argument name

* Bump minimal version

* Bump minimal version to 8.5.3

* Fix installer path for drush commandfiles.

* Update drupal-composer/drupal-scaffold

drupal-composer/drupal-scaffold is a full featured plugin and provides its own command.

* Fix tests on Travis CI (drupal-composer#405)

* Copy the editor config and gitattributes from drupal to the root. (drupal-composer#404)

* Remove "drupal-scaffold" from scripts (drupal-composer#275)

* Fix typo in README.md

* Remove unused use statement. (drupal-composer#406)

* Adjust default core patch level to -p2. (drupal-composer#418)

* Bump minimum required composer-patches version to support default patch level (drupal-composer#410)

* Update composer.json to require latest stable version of Drupal (drupal-composer#424)

* Updating lock file

* Adding drupal-scaffold back in so it works with a lockfile

* drupal-scaffold is now @composer drupal:scaffold
whikloj pushed a commit to islandora-deprecated/drupal-project that referenced this pull request May 24, 2019
@Natkeeran @whikloj
Drupal 8.7 (#27)
b354ba7 
* Honor .env files and suggest usage (drupal-composer#351)

* Remove extra whitespace (drupal-composer#371)

* Updated argument name

* Bump minimal version

* Bump minimal version to 8.5.3

* Fix installer path for drush commandfiles.

* Update drupal-composer/drupal-scaffold

drupal-composer/drupal-scaffold is a full featured plugin and provides its own command.

* Fix tests on Travis CI (drupal-composer#405)

* Copy the editor config and gitattributes from drupal to the root. (drupal-composer#404)

* Remove "drupal-scaffold" from scripts (drupal-composer#275)

* Fix typo in README.md

* Remove unused use statement. (drupal-composer#406)

* Adjust default core patch level to -p2. (drupal-composer#418)

* Bump minimum required composer-patches version to support default patch level (drupal-composer#410)

* Update composer.json to require latest stable version of Drupal (drupal-composer#424)

* Require zaporylie/composer-drupal-optimizations (drupal-composer#442)

* Issue drupal-composer#408: Bump minimum PHP version to 5.6

* Removing redundant "--stability dev" from installation command (drupal-composer#450)

Fixes drupal-composer#449.

* Added "composer-exit-on-patch-failure": true option to composer.json (drupal-composer#420)

* Sync new lines at the end of the files (drupal-composer#453)

* Quote wildcards to avoid issues in some shells (drupal-composer#456)

* Add PHP 7.3 to Travis CI (drupal-composer#476)

* Change createRequiredFiles messages to reflect what occured (drupal-composer#467)

* Drop PHP 5.6 testing (drupal-composer#489)

* Bump minimum version to 8.7.0 (drupal-composer#488)

* Update .travis.yml

* update composer.lock
dannylamb pushed a commit to islandora-deprecated/drupal-project that referenced this pull request Jan 2, 2020
@elizoller @weitzman
@zaporylie @morenstrat @webflo @rodrigoaguilera @leymannx @milkovsky @mxr576 @grasmash @andypost @hansfn @MPParsley @petk @gagarine @foxtrotcharlie @greg-1-anderson @paulvandenburg @dannylamb
Update to Drupal 8.8.1 (#34)
b802bb3 
* Honor .env files and suggest usage (drupal-composer#351)

* Remove extra whitespace (drupal-composer#371)

* Updated argument name

* Bump minimal version

* Bump minimal version to 8.5.3

* Fix installer path for drush commandfiles.

* Update drupal-composer/drupal-scaffold

drupal-composer/drupal-scaffold is a full featured plugin and provides its own command.

* Fix tests on Travis CI (drupal-composer#405)

* Copy the editor config and gitattributes from drupal to the root. (drupal-composer#404)

* Remove "drupal-scaffold" from scripts (drupal-composer#275)

* Fix typo in README.md

* Remove unused use statement. (drupal-composer#406)

* Adjust default core patch level to -p2. (drupal-composer#418)

* Bump minimum required composer-patches version to support default patch level (drupal-composer#410)

* Update composer.json to require latest stable version of Drupal (drupal-composer#424)

* Require zaporylie/composer-drupal-optimizations (drupal-composer#442)

* Issue drupal-composer#408: Bump minimum PHP version to 5.6

* Removing redundant "--stability dev" from installation command (drupal-composer#450)

Fixes drupal-composer#449.

* Added "composer-exit-on-patch-failure": true option to composer.json (drupal-composer#420)

* Sync new lines at the end of the files (drupal-composer#453)

* Quote wildcards to avoid issues in some shells (drupal-composer#456)

* Add PHP 7.3 to Travis CI (drupal-composer#476)

* Change createRequiredFiles messages to reflect what occured (drupal-composer#467)

* Drop PHP 5.6 testing (drupal-composer#489)

* Bump minimum version to 8.7.0 (drupal-composer#488)

* Update .travis.yml

* Deprecate PHP 7.0 and 7.1 (drupal-composer#518)

* Revert "Deprecate PHP 7.1" (drupal-composer#521)

This reverts commit 5085410.

* Issue drupal-composer#518: Bump minimum php version to 7.0.8

* Update CI to Ubuntu 18.04 (drupal-composer#520)

* Revert "Update CI to Ubuntu 18.04" (drupal-composer#526)

This reverts commit ee5bf36.

* Add 'contrib' to Drush commandfile installer path (drupal-composer#525)

* Prefer usage of && operator instead of "and" (drupal-composer#530)

* update to drupal 8.8.0

* replace webflo/drupal-core-require-dev with drupal/core-dev

* Use scaffold plugin and composer packages from Drupal core 8.8.0 (drupal-composer#522)

* Issue drupal-composer#539: Remove deprecated CONFIG_SYNC_DIRECTORY

* update to 8.8.1

Co-authored-by: Moshe Weitzman <weitzman@tejasa.com>
Co-authored-by: Jakub Piasecki <jakub@piaseccy.pl>
Co-authored-by: Markus Orenstrat <markus.orenstrat@reinblau.de>
Co-authored-by: Florian Weber <florian@webflo.org>
Co-authored-by: Rodrigo <hi@rodrigoaguilera.net>
Co-authored-by: Norman Kämper-Leymann <leymannx@users.noreply.github.com>
Co-authored-by: Alex Milkovskyi <a.milkovsky@gmail.com>
Co-authored-by: Dezső BICZÓ <mxr576@users.noreply.github.com>
Co-authored-by: Matthew Grasmick <matthew.grasmick@acquia.com>
Co-authored-by: Andy Postnikov <apostnikov@gmail.com>
Co-authored-by: Hans Fredrik Nordhaug <hansfn@gmail.com>
Co-authored-by: Maarten Segers <MPParsley@users.noreply.github.com>
Co-authored-by: Peter Kokot <peterkokot@gmail.com>
Co-authored-by: Simon Perdrisat <perdrisat@gmail.com>
Co-authored-by: Charles Tanton <charlietnt@gmail.com>
Co-authored-by: Greg Anderson <greg.1.anderson@greenknowe.org>
Co-authored-by: Paul <1727604+paulvandenburg@users.noreply.github.com>
shrop pushed a commit to shrop/drupal-project that referenced this pull request Apr 11, 2020
@rodrigoaguilera @shrop
Copy the editor config and gitattributes from drupal to the root. (dr…
6d17109 
…upal-composer#404)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@rodrigoaguilera @weitzman @webflo