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.

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

Updates ignore-existing to include .editorconfig. #3300

Merged
merged 1 commit into from
Dec 21, 2018

Conversation

mikemadison13
Copy link
Contributor

Fixes #3169

Changes proposed:

(What are you proposing we change?)

  • adds the .editorconfig file to the ignore list for blt updates

@mikemadison13 mikemadison13 added Enhancement A feature or feature request 10.0.x labels Dec 17, 2018
@mikemadison13
Copy link
Contributor Author

@hugovk please review and see if this addresses your issue!

@hugovk
Copy link
Contributor

hugovk commented Dec 17, 2018

@mikemadison13 Thank you! I will test it this week.

Copy link
Contributor

@grasmash grasmash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this makes sense.

Copy link
Contributor

@hugovk hugovk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed running composer update webflo/drupal-core-require-dev drupal/core --with-dependencies does not overwrite .editorconfig.

Thank you!

@grasmash grasmash merged commit bf86af8 into acquia:10.0.x Dec 21, 2018
mikemadison13 added a commit to mikemadison13/blt that referenced this pull request Feb 21, 2019
Fixes acquia#3169 
--------

Changes proposed:
---------
(What are you proposing we change?)

- adds the .editorconfig file to the ignore list for blt updates
mikemadison13 added a commit to mikemadison13/blt that referenced this pull request Feb 21, 2019
Fixes acquia#3169 
--------

Changes proposed:
---------
(What are you proposing we change?)

- adds the .editorconfig file to the ignore list for blt updates
mikemadison13 added a commit that referenced this pull request Feb 25, 2019
* Fixes #3265 to expand alias documentation. (#3399)

* Fixes #3401 for 9.2.x to update devel.

* Moved pipelines-deploy from build event to post-deploy event (#3374)

* Docksal documentation (#3268)

* Add links to docsal and ddev pages.

* Updates ignore-existing to include .editorconfig. (#3300)

Fixes #3169 
--------

Changes proposed:
---------
(What are you proposing we change?)

- adds the .editorconfig file to the ignore list for blt updates

* Updating BLT's docs to remove nvm and point to Cog's documentation for theme installation. (#3313)

* Fix broken link to Cloud Hooks docs. (#3331)

* Added steps to install nfs-utils and enable access via firewalld; without it DrupalVm gets stuck at mounting NFS (#3376)

* Updates release and readme docs. (#3382)

* Updates Travis and Pipelines to PHP 7.1 by default.

* Adds FAQ for drush 8/9 permission denied issue. (#3264)

* Add setup instructions for PHPStorm + PHPUnit (#1787) (#3198)

* Update INSTALL.md (#3273)

* Speed up deploys with shallow fetching (#3271)

Before:
```
real	4m11.340s
user	1m3.430s
sys	1m23.638s
```

After:
```
real	3m14.776s
user	0m47.570s
sys	1m6.415s
```

* Fixes #3217 to provide acsf-init-verify as part of git hooks and blt validate. (#3218)

* Updating Drupal VM config versions. (#3328)

* Fixes #3345 to run db updates even when config strategy is none. (#3363)

* Fixes #3362 to better identify why the site URI is not found. (#3369)

* Test tests:acsf:validate (#3392)

* Test tests:acsf:validate

* Delete README.md

Remove cloud hook readme.

* Update AcsfHooksTest.php

* Update AcsfHooksTest.php

* Update DeployTest.php

* Fixes #3383 to backport Pipelines update to 9.2.x.

* Increase wait timeout. (#3163)

* Fixes #3122 to remove misleading jmeter example. (#3230)

* Fixes #3223 to update git docs. (#3226)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement A feature or feature request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants