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

Update config.json #1963

Merged
merged 2 commits into from
Aug 31, 2017
Merged

Update config.json #1963

merged 2 commits into from
Aug 31, 2017

Conversation

9585999
Copy link
Contributor

@9585999 9585999 commented Aug 31, 2017

change watch path controllers

change watch path controllers
@QWp6t
Copy link
Member

QWp6t commented Aug 31, 2017

That line should be deleted entirely

@@ -14,8 +14,8 @@
"cacheBusting": "[name]_[hash:8]",
"watch": [
"app/**/*.php",
"app/controllers/**/*.php",
Copy link
Contributor

Choose a reason for hiding this comment

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

No need for this, the line above has everything covered

Copy link
Contributor Author

Choose a reason for hiding this comment

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

did not dare to delete)

@kalenjohnson kalenjohnson merged commit 7ce2529 into roots:master Aug 31, 2017
@kalenjohnson
Copy link
Contributor

Thanks!

@9585999
Copy link
Contributor Author

9585999 commented Aug 31, 2017

@kalenjohnson no problem :)

@9585999 9585999 deleted the patch-1 branch August 31, 2017 21:11
oxyc added a commit to generoi/sage that referenced this pull request Sep 6, 2017
* 'genero' of github.com:generoi/sage: (28 commits)
  move options page defaults to bedrock
  fix phpcs
  some more woocommerce defaults
  better defaults
  move out code to separate repos
  Update config.json (roots#1963)
  Add friendly-errors-webpack-plugin (roots#1961)
  fix sql syntax error when post has no terms
  Move /controllers to app, remove app/lib/Sage in readme.
  Controller 9.0.0-beta.4
  Followup roots#1950: Fix lint:styles task with cmd.exe
  Change default Controller path to app/controllers
  Ensure to get templates filenames without path and extension.
  Fix lint:styles script not matching files in deep subdirectories
  Update helpers.php
  Update webpack.config.js (roots#1946)
  👀
  Bump sage-installer
  BS4 now requires Popper
  Bump sage-lib
  ...
ptrckvzn pushed a commit to ptrckvzn/sage that referenced this pull request Sep 13, 2017
* upstream/master: (45 commits)
  Remove get_the_posts_navigation from 404
  Update config.json (roots#1963)
  Add friendly-errors-webpack-plugin (roots#1961)
  Move /controllers to app, remove app/lib/Sage in readme.
  Controller 9.0.0-beta.4
  Followup roots#1950: Fix lint:styles task with cmd.exe
  Change default Controller path to app/controllers
  Ensure to get templates filenames without path and extension.
  Fix lint:styles script not matching files in deep subdirectories
  Update helpers.php
  Update webpack.config.js (roots#1946)
  👀
  Bump sage-installer
  BS4 now requires Popper
  Bump sage-lib
  Bootstrap 4 Beta, Sage 9.0.0-beta.4
  Remove PHP 5.6 tests from Travis
  Update README.md
  Update sage-installer 1.1 -> 1.2
  Update CHANGELOG
  ...

# Conflicts:
#	package.json
#	resources/assets/build/postcss.config.js
#	resources/assets/build/webpack.config.js
#	resources/assets/styles/common/_global.scss
#	resources/assets/styles/common/_variables.scss
#	resources/assets/styles/components/_comments.scss
#	resources/assets/styles/components/_forms.scss
#	resources/assets/styles/components/_wp-classes.scss
#	resources/assets/styles/layouts/_header.scss
#	resources/assets/styles/main.scss
#	yarn.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants