diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-07-09 10:21:18 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-07-09 10:21:18 +0100 |
| commit | 81b9b6f4095a430d2afe54a95ea1fa172fe9c0e1 (patch) | |
| tree | 8d15b3a4ca984bff193ee0807ab48d7e1cad7d78 /vendor/gitignore/CraftCMS.gitignore | |
| parent | 156a9d39131b6193e0e6bc5ec7f1683305166fa8 (diff) | |
| parent | dc71b4004bd9773d03d5a4eeaba2db883e5a2251 (diff) | |
| download | gitlab-ce-81b9b6f4095a430d2afe54a95ea1fa172fe9c0e1.tar.gz | |
Merge branch 'master' into 48960-namespace-diff-module
* master: (29 commits)
Update the dependencies license list for 11.1.0
Update .gitignore, .gitlab-ci.yml, and Dockerfile templates for 11.1.0
This updates only the actual new discussion and not the full tree , which leads to a very costly full rerender
Resolve "MR Refactor: Improve performance by setting v-once"
Changed Inline + Parallel Views to v-if instead of v-show
add basic export to fix timeout problem on import_file_spec.rb
Add changelog entry for !20465
Improve render performance of large wiki pages
Refactor rspec matchers in read_only_spec.rb
add CHANGELOG.md entry for !20461
resolve node 6 compatibility issues
Add missing foreign key in import_export_uploads
Redesign for mr widget info and pipelines section
Use proper markdown rendering for previews
remove extra tick for eks docs
Make it clear that we need to enable omniauth for SAML and Bitbucket
Add GPL Commitment language
Add ExclusiveLease guards for RepositoryCheck::{DispatchWorker,BatchWorker}
Ability to check if underlying database is read only
fix spec
...
Diffstat (limited to 'vendor/gitignore/CraftCMS.gitignore')
| -rw-r--r-- | vendor/gitignore/CraftCMS.gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/gitignore/CraftCMS.gitignore b/vendor/gitignore/CraftCMS.gitignore index a70d4772c46..0d81b397e35 100644 --- a/vendor/gitignore/CraftCMS.gitignore +++ b/vendor/gitignore/CraftCMS.gitignore @@ -1,3 +1,4 @@ -# Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore] +# Craft 2 Storage (https://craftcms.com/support/craft-storage-gitignore) +# not necessary for Craft 3 (https://github.com/craftcms/craft/issues/26) /craft/storage/* -!/craft/storage/logo/*
\ No newline at end of file +!/craft/storage/rebrand |