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
Dennis Günnewig
856f05709c
Support template chaining for partials
2014-07-31 11:39:02 +02:00
Dennis Günnewig
0add2e6676
Added a step to create templates on the fly
2014-07-31 08:46:22 +02:00
Thomas Reynolds
b39b913cfb
Merge pull request #1337 from dg-vrnetze/feature/new_server_steps
...
Added some new steps to test middleman applications
2014-07-29 07:22:38 -07:00
Max Meyer
398a038523
Support check for status code
2014-07-29 09:04:10 +02:00
Max Meyer
6dc7eb6353
Support should not see block
2014-07-29 09:03:56 +02:00
Thomas Reynolds
2f545cefbe
Attempt to allow i18n to override partial lookup. #1333
2014-07-24 11:11:27 -07:00
Thomas Reynolds
15d6210df8
Use the resource instead of the request path for auto asset helpers. Fixes #1326
2014-07-20 13:53:05 -07:00
Thomas Reynolds
2426abe6f5
bump deps
2014-07-18 14:16:50 -07:00
Thomas Reynolds
f0603ddf2f
work with static partials. Closes #1206
2014-07-18 10:54:48 -07:00
Thomas Reynolds
b6951f2729
use stable sprockets branch
2014-07-17 09:32:38 -07:00
Eliott Appleford
249c649760
Merge pull request #1312 from Arcovion/windows-specs
...
Fix specs on windows
2014-07-06 07:44:20 +01:00
Eliott Appleford
a47b58c58d
fix gemfile conflict
2014-07-06 05:48:21 +01:00
Eliott Appleford
21c2b737f5
fix gzip spec
2014-07-06 04:02:43 +01:00
Thomas Reynolds
8bf523853e
Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable
2014-07-05 18:42:21 -07:00
Thomas Reynolds
ffa8415aaf
bump aruba dep
2014-07-05 18:42:15 -07:00
Thomas Reynolds
605bd4ca24
Update README.md
2014-07-05 18:35:39 -07:00
Thomas Reynolds
5f515de2b6
Merge pull request #1315 from Arcovion/v3-stable
...
Update badges
2014-07-05 18:28:23 -07:00
Eliott Appleford
c824807119
Update badges
2014-07-06 02:13:42 +01:00
Eliott Appleford
5897c4c4a4
update gemfile
2014-07-05 04:27:51 +01:00
Eliott Appleford
e2e3c1e3fb
fix specs on windows
2014-07-03 21:09:32 +01:00
Thomas Reynolds
ba38498909
Merge pull request #1310 from Arcovion/patch-1
...
Update listen code
2014-07-02 10:39:19 -07:00
Eliott Appleford
d8f84fa97b
Update listen code
2014-07-02 18:26:18 +01:00
Thomas Reynolds
7b85a44afb
rubocoping
2014-07-02 10:11:52 -07:00
Thomas Reynolds
bbc551624e
Merge pull request #1309 from Arcovion/patch-1
...
Update listen gem
2014-07-02 09:24:28 -07:00
Eliott Appleford
6678decd29
Update listen gem
2014-07-02 12:57:01 +01:00
Ben Hollis
32bdc43ccb
Merge pull request #1268 from AndrewKvalheim/gzip-ignore
...
Excluding paths from gzipping
2014-06-25 21:57:26 -07:00
Andrew Kvalheim
429e7d64bd
Accept list of paths to exclude from gzipping.
2014-06-24 14:49:51 -07:00
Andrew Kvalheim
b819d38358
Test gzip extensions option.
2014-06-24 14:49:10 -07:00
Andrew Kvalheim
13ba9dae62
Make option documentation consistent.
2014-06-24 14:47:10 -07:00
Ben Hollis
5c991ba4dc
Add a protective require
2014-06-22 20:46:39 -07:00
Thomas Reynolds
fe5247d9d9
Add <head> to 404 so Livereload can add its script to the page
2014-06-16 08:58:16 -07:00
Thomas Reynolds
a35a38dd5f
Merge pull request #1295 from nevir/patch-1
...
`Rubocop` is now `RuboCop`
2014-06-11 10:18:32 -07:00
Ian MacLeod
d1c71e473d
Rubocop is now RuboCop
...
See ff167d8f20
2014-06-09 17:34:33 -07:00
Thomas Reynolds
ca0573d92a
Merge pull request #1266 from 747/working
...
A quick fix for finding eponymous parents
2014-05-30 14:20:11 -07:00
Ben Hollis
430521be83
Merge pull request #1281 from adamjonas/v3-stable
...
update rspec should syntax to expect
2014-05-25 21:13:34 -07:00
Thomas Reynolds
1a461154b6
prep
2014-05-24 19:27:56 +09:00
Thomas Reynolds
72b945682a
Fix threadsafety issue with assignment. Fixes #501 . Also, WTF?
2014-05-24 19:18:12 +09:00
Thomas Reynolds
dc15006340
We are semver
2014-05-24 18:51:18 +09:00
Thomas Reynolds
610716ee80
Work around possible mutable data issue #501
2014-05-22 19:20:43 +09:00
Ben Hollis
dc33f6b3fa
Fix before_render after change to hooks-0.4.0. Related to #1278 .
2014-05-15 23:55:39 -07:00
Ben Hollis
f29994e25a
Fix tests after Padrino 0.12.2 release
2014-05-15 23:35:09 -07:00
adamjonas
9887fe510c
update rspec should syntax to expect
2014-05-15 11:51:42 -04:00
Thomas Reynolds
1c6cd27171
Merge pull request #1278 from bootstraponline/fix_after_render
...
Fix after_render
2014-05-11 16:03:22 -07:00
bootstraponline
3f0373adf2
Fix after_render
...
Example usage from config.rb:
after_render do |content, path, locs, template_class|
# restore character entities such as &#96;
content ||= ''
content.gsub! '&', '&'
content
end
2014-05-11 14:06:04 -04:00
