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
Steven Sloan
9ba1dc040f
reorganize all Middleman::Util specs to a single spec file, add specs for PR #1426
2015-01-15 13:29:37 -05:00
Thomas Reynolds
f02713788d
fix strange change to how file contents are checked in aruba
2015-01-15 09:56:28 +00:00
Thomas Reynolds
0409c5bcbe
Merge pull request #1426 from stevenosloan/standardize_recursively_enhance_for_hash_with_indifferent_access
...
Standardize recursively enhance for hash with indifferent access
2015-01-15 09:43:13 +00:00
Steven Sloan
14e1cb1cd6
move all HashWithIndifferentAccess recursive enhancement over to the Util class
...
TODO: moving this two a class method on HashWithIndifferentAccess would really make the most sense, but there are two blockers:
- historically the method has operated out of Util. While totally ok, simply dedeferring to HashWithIndifferentAccess feels a bit awkward
- the contracts gem doesn’t support class method at this time. the assurance of frozen output is important considering the uses of the recursively_enhance method
2015-01-15 03:30:26 -05:00
Steven Sloan
a771b15700
rewrite CoreExtension::Data#key? to prevent potential SystemStackError
...
since data_for_path can trigger respond_to?, and respond_to? uses key? — a SystemStackError could trigger if data_for_path was called.
2015-01-15 02:46:59 -05:00
Dennis Günnewig
0f95d74827
Use guard clause
2015-01-08 14:58:00 +01:00
Dennis Günnewig
88965858ec
Disable some quite noisy cops
2015-01-08 14:57:38 +01:00
Dennis Günnewig
79dbfa0238
Rubcop found some new offenses
2015-01-08 14:55:03 +01:00
Dennis Günnewig
747ca86212
Fixed offense
2015-01-08 14:53:20 +01:00
Thomas Reynolds
f1f5ea3e5d
Merge pull request #1422 from jarednorman/fix-file-ending
...
Fix line ending format in all.js
2015-01-06 10:09:04 -08:00
Jared Norman
a4406e7d9c
Fix line ending format in all.js
...
Resolves #1302
2015-01-06 09:06:36 -08:00
Thomas Reynolds
ddc048e075
swap rbx for another jruby
2015-01-04 16:10:58 -06:00
Thomas Reynolds
69f8245f7b
bump
2015-01-04 15:42:22 -06:00
Thomas Reynolds
39c7c9df54
fix leftover flag
2015-01-04 15:28:13 -06:00
Thomas Reynolds
857c99fab5
attempt to fix interactive cli timeout
2015-01-04 15:23:37 -06:00
Thomas Reynolds
8e743aea94
fix interactive init test
2015-01-04 15:06:14 -06:00
Thomas Reynolds
96e05128a1
attempt to improve travis perf
2015-01-04 14:42:06 -06:00
Thomas Reynolds
f16510d034
Update CLI
2015-01-04 14:23:35 -06:00
Thomas Reynolds
302a891bbb
Update some deps
2015-01-03 14:32:21 -06:00
Eliott Appleford
96b324cf45
Merge pull request #1415 from dg-ratiodata/feature/upgrade_i18n
...
Update version of i18n
2014-12-28 21:48:29 +00:00
Max Meyer
67125a3f91
Supress warning because of method name offense
2014-12-28 10:50:12 +01:00
Max Meyer
e69704b540
Fixed whitespace offenses
2014-12-28 10:49:46 +01:00
Max Meyer
488a4b74ab
Update version of i18n
2014-12-28 10:36:33 +01:00
Thomas Reynolds
eb1a658b25
over calling change callbacks which are unnecessary.
2014-12-26 14:11:58 -08:00
Thomas Reynolds
ef0b996004
blog compat
2014-12-24 11:38:54 -08:00
Thomas Reynolds
ee4c68b03c
prep alpha, backwards compat
2014-12-23 14:54:21 -08:00