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
Eliott Appleford
a977f8bf20
Merge pull request #1416 from dg-ratiodata/feature/fix_offenses
...
Fix rubocop offenses
2015-02-19 00:50:46 +00: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
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
Dennis Günnewig
0f95d74827
Use guard clause
2015-01-08 14:58:00 +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
Jared Norman
a4406e7d9c
Fix line ending format in all.js
...
Resolves #1302
2015-01-06 09:06:36 -08: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
Steven Sloan
85fa3fac02
add support for “sidecar” frontmatter at the destination url of proxied resources
...
a “cheap” way to support adding data to pages created through `proxy` or `page` by adding frontmatter at the expected destination url.
for example proxying a page to `/proxied.html`, by adding a sidecar frontmatter file at `source/proxied.html.frontmatter` (or source/proxied.frontmatter if directory indexes is activated) the frontmatter will be merged with the proxy source and available to `current_resource` at the destination.
2014-12-22 13:59:27 -05:00
Thomas Reynolds
29693e4533
More URI encoding and decoding. Addresses #1406
2014-11-19 10:39:48 -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
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
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
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
18825e7ced
no reason for image sizes to touch the alt attr
2014-08-22 09:36:07 -07:00
Thomas Reynolds
0d2bcbabe9
Remove duplicate attr_accessor. Closes #1352
2014-08-20 09:48:55 -07:00
Thomas Reynolds
a1979f11b1
Update sass dep and test new error message
2014-08-20 09:48:03 -07:00
Thomas Reynolds
51d57afc73
require new compass, fix tests
2014-08-17 13:20:29 -07:00
Christian Höltje
6895f30ff3
Accept pandoc-style YAML frontmatter
...
Pandoc (and some other tools) have decided to end their YAML frontmatter
with `...` instead of `---`. In the name of flexibility, this patch
allows either to mark the end of YAML frontmatter.
Example:
```
---
title: No place like home
...
```
2014-08-15 13:21:30 -04:00
Thomas Reynolds
fae0e00f42
Add webp to our image type lists
2014-08-14 09:04:26 -07:00
Thomas Reynolds
2b928a326c
Handle breaking padrino change. Closes #1349
2014-08-13 20:24:20 -07:00
Thomas Reynolds
625391953a
Remove a Padrino hack. They fixed the bug upstream and now our hack is the problem. Closes #1327
2014-08-04 15:07:55 -07:00
Thomas Reynolds
05aa396399
more slim tests. Targets #1327
2014-08-04 14:41:22 -07:00
Thomas Reynolds
1c977a83e2
prep
2014-08-03 08:37:46 -07:00
Thomas Reynolds
724eab3ac9
fix alt tags and add test. Closes #1341
2014-08-03 08:29:29 -07:00
Dennis Günnewig
fee6a8b617
Make rubocop happy
2014-07-31 13:13:07 +02:00
Dennis Günnewig
98a36d68f0
Merge branch 'v3-stable' into feature/chained_templates_partials
...
Conflicts:
middleman-core/lib/middleman-core/core_extensions/rendering.rb
2014-07-31 13:00:19 +02:00