deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2683 commits 11 branches 271 tags 23 MiB
Commit graph

2683 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Reynolds
40e01b0b21 Merge pull request #1498 from stevenosloan/allow_setting_destination_directory_for_source_watchers 
allow setting a destination_dir for SourceWatcher(s)
 2015-04-17 15:03:29 -07:00
Steven Sloan
3b1a00cf47 allow setting a destination_dir for SourceWatchers 
This change lets a source be defined with a destination directory. That way we can mount a source (say a gem’s ‘doc’ directory) in a namespace and worry less about name collisions with  files in other sources.
 2015-04-17 16:46:39 -04:00
Thomas Reynolds
f61e08a9c3 Allow more permissive compass versions 2015-03-30 17:05:36 -07:00
Thomas Reynolds
30721436c0 Allow extensions to activate extensions 2015-03-27 10:56:09 -07:00
Thomas Reynolds
6fef5b3a93 Require forwardable. Closes #1479 2015-03-05 09:46:38 -08:00
Thomas Reynolds
26c6f453f3 Add file watcher :only option 2015-02-26 17:08:40 -08:00
Thomas Reynolds
c94e5d0f4d Merge from stable 2015-02-24 11:16:16 -08:00
Thomas Reynolds
ce2d5028b2 Merge pull request #1445 from alex88/patch-1 
Add Woff2 to asset hash extensions
 2015-02-24 09:50:51 -07:00
Thomas Reynolds
fbe71f51e4 Merge pull request #1465 from thomasritz/fix-wrong-parent 
Fixes computation of `parent`.
 2015-02-23 14:18:31 -07:00
Thomas Reynolds
a3772428c1 Merge pull request #1456 from yterajima/feature/add-template-test 
Add test to `$ middleman init` using tmeplate
 2015-02-23 12:30:11 -08:00
Thomas Reynolds
973f79a103 Dropping ruby 1.9.x support 2015-02-23 12:29:51 -08:00
Thomas Reynolds
a3519bdf37 Bump 2015-02-23 12:28:30 -08:00
Thomas Reynolds
cac0484de8 Fixes #1469 2015-02-23 12:26:37 -08:00
Eliott Appleford
e2ae2e5e42 Merge pull request #1468 from vassilevsky/fix-grammar 
Fix grammar in a scenario
 2015-02-23 16:52:01 +00:00
Eliott Appleford
35e01136fc Merge pull request #1467 from henrik/patch-1 
Fix proxy pages link in config template
 2015-02-23 16:50:40 +00:00
Ilya Vassilevsky
4d75ba7749 Fix grammar in a scenario 2015-02-23 01:53:14 +03:00
Henrik Nyh
55673480dc Fix proxy pages link in config template 
Old link is broken.
 2015-02-22 20:31:28 +01:00
Thomas Ritz
262e976790 Fixes computation of parent. 
If there is a file without a basename in root, e.g. `.htaccess`,
`#parent` of another file in root finds `.htaccess` instead of
`index.html`.

Adding the `.htaccess` to the traversal-app fixture exposes this error.
The fix is to no longer scan for possible files if we know the parent
must be root.
 2015-02-21 19:07:17 +01:00
Thomas Reynolds
ad05b33cf6 Merge pull request #1459 from twuni/bugfix/readme-pessimistic-versioning-link 
Fixing broken (outdated) link for the Pessimistic Versioning Constraint.
 2015-02-19 15:00:21 -08:00
Devin Canterberry
ac1e289064 Fixing broken (outdated) link for the Pessimistic Versioning Constraint. 2015-02-19 14:56:19 -08:00
Eliott Appleford
a977f8bf20 Merge pull request #1416 from dg-ratiodata/feature/fix_offenses 
Fix rubocop offenses
 2015-02-19 00:50:46 +00:00
Thomas Reynolds
6a228bc5c9 Merge pull request #1457 from Arcovion/slim-update 
Fix slim >= 3.0.0 deprecation warning
 2015-02-18 16:33:56 -08:00
yterajima
ceb4769325 Add test to $ middleman init using tmeplate 
* using Middleman directory
* using github
    * user/repository
    * user/repository#branch
* using full path
    * contains "://"
 2015-02-19 01:02:21 +09:00
Eliott Appleford
0230e26a8c Fix slim >= 3.0.0 deprecation warning 2015-02-18 14:22:50 +00:00
Thomas Reynolds
1cce64d463 Bump 2015-02-17 16:08:58 -08:00
Thomas Reynolds
14104aad70 Try to avoid *nix double load issue again 2015-02-17 09:39:59 -08:00
Thomas Reynolds
fd3d9b206f Attempt to avoid double-load issue 2015-02-16 15:53:21 -08:00
Thomas Reynolds
f11057c70c change deploy call 2015-02-13 14:42:17 -08:00
Thomas Reynolds
2f558ec571 Fix test 2015-02-13 14:39:08 -08:00
Thomas Reynolds
4d7b21185f fix strange change to how file contents are checked in aruba 2015-02-13 14:34:15 -08:00
Thomas Reynolds
85c8143d49 bump 2015-02-13 14:31:53 -08:00
Thomas Reynolds
5b39a33ab6 Serve sourcemaps as JSON so extensions which rely on mime-type function correctly 2015-02-13 14:28:12 -08:00
Thomas Reynolds
13a24d99ba Merge pull request #1449 from alex88/feature/git-ssh-template-source 
Clone templates from ssh 'git@' urls
 2015-02-13 09:25:06 -08:00
Alessandro Tagliapietra
bf9f94989d Clone templates from ssh 'git@' urls 2015-02-13 10:08:09 +01:00
Thomas Reynolds
5cb880064d Merge pull request #1448 from alex88/feature/git-url-template 
Clone template from full repository urls
 2015-02-12 09:27:22 -08:00
Alessandro Tagliapietra
640c87c13a Clone template from full repository urls 2015-02-12 15:40:54 +01:00
Alessandro Tagliapietra
3c5c677a07 Add Woff2 to relative assets extension 2015-02-11 00:09:40 +01:00
Alessandro Tagliapietra
d97e380db8 Add Woff2 to builder asset order 2015-02-10 23:58:29 +01:00
Alessandro Tagliapietra
19db9f3be1 Add Woff2 to asset hash extensions 2015-02-10 23:30:20 +01:00
Thomas Reynolds
986b9fcf51 Merge pull request #1444 from joost/patch-2 
Add :overwrite option to gzip
 2015-02-10 14:02:48 -08:00
Joost Hietbrink
28199950e9 Add :overwrite option to gzip 
Useful for deployment to S3 together with gzip content-encoding.
 2015-02-10 21:49:15 +01:00
Thomas Reynolds
04da75a2eb Merge pull request #1443 from hagenburger/allow-custom-option 
don’t override :custom if already set
 2015-02-10 07:14:15 -08:00
Nico Hagenburger
98b06878a5 fixed space 2015-02-10 09:28:31 +01:00
Nico Hagenburger
a5c65bac53 don’t override :custom if already set 
Sometimes Sprockets needs to access
`options[:custom][:sprockets_context]`. If this is set, it should not be
overridden. This happens when building a LivingStyleGuide file when the
Sass source uses `asset-path`, `image-url` or similar functions.
 2015-02-09 23:16:20 +01:00
Thomas Reynolds
e4b7d4fff0 begin prepping beta.1 2015-02-07 13:38:29 -08:00
Eliott Appleford
eede4a8c5d Merge pull request #1439 from danilovaz/v3-stable 
Update copyright date README
 2015-02-01 02:53:29 +00:00
Danilo Vaz
19371188b0 Update copyright date README 2015-02-01 00:23:26 -02:00
Thomas Reynolds
b666a7aaee Merge pull request #1434 from joost/patch-1 
Fix 404 for sub-mounted apps
 2015-01-26 10:40:48 -08:00
Joost Hietbrink
7bec48c688 Fix 404 for sub-mounted apps 
404 now shows full path (similar to url).
 2015-01-26 14:33:22 +01:00
Thomas Reynolds
46ebc9d518 Merge pull request #1427 from stevenosloan/add_specs_for_recursively_enhance 
add specs for #1426 & reorganize Middleman::Util specs to a single file
 2015-01-15 23:02:29 +00:00