Commit graph

1329 commits

Author SHA1 Message Date
Thomas Reynolds 1605f425e8 Fixes #1733 2016-01-05 10:58:22 -08:00
Thomas Reynolds bfb6a7fa16 Merge pull request #1725 from maxmeyer/feature/phantomjs
Added phantomjs as gem to make test suite pass
2016-01-05 10:34:46 -08:00
Thomas Reynolds 62b17d38ad Merge pull request #1734 from GhostGambler/issue-1702
Issue #1702
2016-01-05 09:50:41 -08:00
Ulrich Gabor 298b3909ed First fix to actually use the encoding option again 2016-01-05 15:15:06 +01:00
Ulrich Gabor 1ca5be7b19 Tests for issue #1702 2016-01-05 15:15:01 +01:00
Ulrich Gabor bdeb19059a Test for issue 1709; parent relations with localized and non-localized sources 2016-01-05 15:08:26 +01:00
Dennis Günnewig b0a4d53963 Added phantomjs as gem to make test suite pass 2016-01-01 20:51:26 +01:00
Thomas Reynolds 5684caeee6 Merge pull request #1721 from bhollis/issue1721-relative-paths
relative URLs don't work in image_tag
2015-12-30 16:04:09 -08:00
Ben Hollis 9311a72e4a Use our relative_path_from_resource helper in asset_url. 2015-12-28 20:52:22 -08:00
Ben Hollis 412f6ac1fc Fix #1721 by passing through options to url_for. 2015-12-28 20:52:22 -08:00
Ben Hollis d464162e8e Fix #1715 by passing along path in DefaultHelpers#asset_url. 2015-12-28 17:40:21 -08:00
Thomas Reynolds 4a8cd4c3d2 fix extension test 2015-12-21 13:27:44 -08:00
Thomas Reynolds a5821bccec Fix asset hash with query string or hash params. Closes #1411 2015-12-21 13:07:01 -08:00
jordanandree e035d625c8 skip front matter on ingored resources 2015-12-17 14:01:37 -05:00
Thomas Reynolds b2b461935d Here we go 2015-12-15 19:58:04 -08:00
Thomas Reynolds 9e5b137ed8 Really fix #1689 2015-12-15 09:58:22 -08:00
Thomas Reynolds 6af784d5d5 One more RC 2015-12-14 11:02:07 -08:00
Thomas Reynolds 0e620a1ba1 Resolve Contracts warning 2015-12-14 10:22:27 -08:00
Johnny Shields 308ea6db5a Include :locales and :data in live-reloadable types 2015-12-14 09:51:25 -08:00
Jim Dalton f3296815c8 Add explicit option to prevent external option from running in background 2015-12-13 22:12:11 -08:00
Thomas Reynolds 4122bd7351 Add back compass sprite prerender step 2015-12-13 14:30:10 -08:00
Thomas Reynolds defa6daa6d pt 3 2015-12-13 14:19:33 -08:00
Thomas Reynolds 82220eab4e fix git issue pt 2 2015-12-13 14:19:05 -08:00
Thomas Reynolds 3c1d28ce1b fix git issue pt 1 2015-12-13 14:18:54 -08:00
Thomas Reynolds 01f899f529 Print a failing build so I can debug on travis 2015-12-13 13:59:44 -08:00
Thomas Reynolds b6befd3fc3 Rubocop and disable an annoying test 2015-12-13 13:29:33 -08:00
Thomas Reynolds 28a0071be7 Rename langs to locales in i18n. Provide backwards compat. Closes #1652 2015-12-13 13:20:48 -08:00
Thomas Reynolds 76f591788e Change inline URL matcher to only match strings, not newlines. Fixes #1689 2015-12-13 13:06:05 -08:00
Thomas Reynolds d3a5494062 Handle invalid URLs in rewriter. Fixed #1638 2015-12-13 12:32:21 -08:00
Thomas Reynolds 2674981d0b Fix yesterday's bone-headed commit. again 2015-12-09 17:08:58 -08:00
Thomas Reynolds 9b0b82c00b Fix yesterday's bone-headed commit 2015-12-09 17:03:55 -08:00
Thomas Reynolds cb6e8bcd95 Fix first-run issue with pipeline 2015-12-08 14:46:03 -08:00
Thomas Reynolds 2178a755e2 Minor SassC load_paths fix 2015-11-30 17:40:14 -08:00
Thomas Reynolds 7b3f5384e9 Add SassC message 2015-11-30 17:29:46 -08:00
Thomas Reynolds 07a216d5ca Remove sprockets/compass references 2015-11-30 17:14:02 -08:00
Thomas Reynolds 578ff18fa0 Bump some deps 2015-11-30 16:58:17 -08:00
Thomas Reynolds ae15d203a8 Fix some tests 2015-11-28 19:32:45 -08:00
Thomas Reynolds e47b0ae29a import_file and import_path APIs. Addresses #1632 2015-11-28 18:03:05 -08:00
Thomas Reynolds 16b997498b Generic related files check 2015-11-28 16:48:08 -08:00
Thomas Reynolds a546e0f523 See if that fixes travis 2015-11-28 14:51:37 -08:00
Thomas Reynolds f2db1567a4 Use SassC in tests 2015-11-27 16:19:26 -08:00
Thomas Reynolds 6de88a832e Make Ruby Sass the default, but use SassC if available. Addresses #1648 2015-11-27 15:41:42 -08:00
Thomas Reynolds dd0ee24ca3 Work around Listen :only weirdness. Addresses #1637 2015-11-27 15:26:46 -08:00
Thomas Reynolds 822a9f0ecc Fix layout detection on non-html files 2015-11-27 14:26:34 -08:00
Thomas Reynolds 4594f46fb8 Minor tweak to #1695 2015-11-27 14:16:55 -08:00
Johnny Shields 13a14d43d4 In SourceWatcher, add a subroutine to find files which should be considered "also dirty" when a given file is touched. 2015-11-27 15:20:20 +09:00
Steven Sloan 6ab6669456 fix(Util::asset_url): allow use without passing a current_resource
Most cases the current_resource isn’t actually needed, so calls could be made
from extensions and still get the correct path back.

An exception will be raised with a descriptive message if the current_resource
is needed but not given. (for example, if relative is true — it needs a resource
to base the url on)
2015-11-13 16:48:52 -05:00
Steven Sloan 49a7435dc9 spec(Util::asset_url): add specs covering each conditional branch 2015-11-13 16:37:58 -05:00
Steven Sloan f16fc2229e feat(testing): add a fixture/file helper for rspec tests 2015-11-13 16:34:08 -05:00
Thomas Reynolds 37d96a9b14 Adapt to style changes and removal of on 2015-11-11 15:30:40 -08:00