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
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
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
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
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
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
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
Thomas Reynolds
d8e8b06cb6
merge v3
2014-11-19 09:04:56 -08:00
Thomas Reynolds
17eb54b9dc
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
2014-11-16 12:42:58 -08:00
Thomas Reynolds
3eafb4fcf4
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
2014-11-16 12:35:45 -08:00
Dennis Reimann
e28ed20c63
Asset hashing for image references in srcset
...
Fixes #1287
2014-11-16 21:25:28 +01:00
justin blecher
dcca8968c8
exclude .git folder when init'ing a local template
...
freshly init'd middleman projects from a local template should not
include the git files from that template because that's confusing.
this is to help users who clone git repos into `~/.middleman/`.
2014-11-12 19:12:52 -05:00
Thomas Reynolds
be98103e05
An attempt to fix #1402
2014-11-09 11:30:11 -08:00
Thomas Reynolds
c231e00f00
bump
2014-11-08 21:06:17 -08:00
claudiob
9d49b08426
Import patch to bugfix from Padrino Helpers
...
Padrino had an issue https://github.com/padrino/padrino-framework/issues/1582
which was solved at 72769fe39a (diff-526024418d0d573e08d46ba3d55c02bcR36)
This commit brings the same fix back into Middleman's method that
overrides Padrino's method.
2014-11-08 13:01:13 -08:00
Max Meyer
f4ce1ff99d
Switch to current working directory during testing
2014-11-03 09:17:43 +01:00
Thomas Reynolds
7c37d4ba51
Merge pull request #1338 from dg-ratiodata/feature/chained_templates_partials
...
Chained template parsing failed if parent is "html.erb" and child is "html.md.erb"
2014-10-23 15:25:10 -07:00
Thomas Reynolds
65d3a0c84f
Be a bit safer about checking source_file in Sitemap Preview. Working towards fixing #1166
2014-10-20 11:24:52 -07:00
Thomas Reynolds
91d0d39569
stylistic change
2014-10-20 11:19:30 -07:00
Thomas Reynolds
c7922c4a35
move actual type detection to sprockets
2014-10-18 12:56:52 -05:00
Thomas Reynolds
6a3d2e7e4e
slightly better types debug message
2014-10-18 12:50:18 -05:00
Thomas Reynolds
d0a9f01b2f
Treat source file types more like tags, allow a set of them
2014-10-18 12:45:49 -05:00
Thomas Reynolds
54e10cf472
yield self along with options in extension activation
2014-10-18 12:11:18 -05:00
Thomas Reynolds
a95dbb6367
Collections
2014-10-15 14:34:53 -05:00
Thomas Reynolds
445443cffc
Add a bit of laziness
2014-10-15 14:25:06 -05:00
Thomas Reynolds
ddfa37faee
Use HTTPS by default in new project Gemfiles. Closes #1372
2014-10-12 09:38:14 -05:00
minusfive
17cddce675
Parse asset-hashes on JSON files
2014-09-28 16:39:46 -04:00
Thomas Reynolds
1b0b666130
bump
2014-09-15 15:36:57 -07:00
Thomas Reynolds
e326e10e98
listen gem started using full paths instead of relative. Fixes #1374
2014-09-15 15:36:41 -07:00
Thomas Reynolds
f73e89370d
execute modes as configure blocks
2014-09-11 09:40:10 -07:00
Andrew Kvalheim
00b4ac6867
Add a basic feature test for the console.
2014-09-10 16:12:04 -07:00
Dennis Günnewig
d45911f7b8
Add force-option to init
2014-09-09 09:19:41 +02:00
Dennis Günnewig
55e3c93278
Feature tests for force-option
2014-09-09 09:19:31 +02:00
Dennis Günnewig
b78515ce91
Fixed rubocop offense
2014-09-09 09:02:50 +02:00
Thomas Reynolds
313a2398d4
attempt to get compass 1 working
2014-09-02 12:43:20 -07:00
Thomas Reynolds
5a85d177c2
Catch File read exceptions in frontmatter
2014-08-29 10:24:45 -07:00
Thomas Reynolds
df22160173
apparently nums are freezable
2014-08-24 18:30:14 -07:00
Thomas Reynolds
5c18b85a8e
more freeze fixin
2014-08-24 18:11:56 -07:00
Thomas Reynolds
1d5ae59db9
Lazy isn't in 1.9.3 :(
2014-08-24 17:35:02 -07:00
Thomas Reynolds
84acb50b02
Optimize globbed file lookups, fixes nasty performance regression
2014-08-24 17:10:25 -07:00
Thomas Reynolds
6ef96cc15a
more instrumenting
2014-08-24 15:49:53 -07:00