Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2086 from GeXu3/hgignore-assets-folder-error-fix

.hgignore has wrong rule for assets folder
  • Loading branch information...
commit a4af88fea8833428732309d43fc248cb9cc9d72d 2 parents 98c9f77 + 7dfb56f
@cebe cebe authored
Showing with 4 additions and 3 deletions.
  1. +1 −0  CHANGELOG
  2. +3 −3 framework/cli/views/webapp/hg-hgignore
View
1  CHANGELOG
@@ -16,6 +16,7 @@ Version 1.1.14 work in progress
- Bug #2030: Fixed problem with MySQL 4.x: Undefined Index: Comment in CMysqlSchema (cebe)
- Bug #2049: CStatElement relation with join option throw exception when key-field present on joined table (Yiivgeny)
- Bug #2078: Fixed problem with "undefined" parameter in query string when using CListView or CGridView with enableHistory (Parpaing)
+- Bug #2086: Fixed .hgignore rule for assets folder (GeXu3, Koduc)
- Enh: Better CFileLogRoute performance (Qiang, samdark)
- Enh #1847: Added COutputCache::varyByLanguage to generate separate cache for different languages (Obramko)
- Enh #1977: CFormatter::normalizeDateValue() now is protected instead of private to enable child classes to override it (etienneq)
View
6 framework/cli/views/webapp/hg-hgignore
@@ -2,6 +2,6 @@ syntax: glob
syntax: regexp
# ignore all except .hgkeep
-assets/(?!.*\.hgkeep$).+
-protected/runtime/(?!.*\.hgkeep$).+
-protected/tests/report/(?!.*\.hgkeep$).+
+^assets/(?!.*\.hgkeep$).+
+^protected/runtime/(?!.*\.hgkeep$).+
+^protected/tests/report/(?!.*\.hgkeep$).+
Please sign in to comment.
Something went wrong with that request. Please try again.