Thomas Reynolds
0415b76d4f
tests for content_tag escaping
2013-06-18 11:12:41 -07:00
Thomas Reynolds
298e842510
Merge pull request #941 from krautcomputing/fix_content_tag_helper
...
Fix content_tag helper, only try to mark content as safe if it is not a hash of options
2013-06-18 11:01:28 -07:00
Manuel Meurer
c75e31ae94
Fix content_tag helper, only try to mark content as safe if it is not a hash of options
2013-06-18 10:12:38 +02:00
Thomas Reynolds
0e69928939
bump ver
2013-06-17 00:47:58 +00:00
Thomas Reynolds
efe52f7cca
Check if set is redefining a param at the class level. Fixes #939
2013-06-17 00:47:10 +00:00
Thomas Reynolds
f0707c0968
Prevent relative asset helper from munging data URIs. Closes #938 .
2013-06-15 16:22:14 -07:00
Thomas Reynolds
9320007be6
dum dum dum.....
2013-06-14 16:31:51 -07:00
Thomas Reynolds
8eac168618
new rc
2013-06-13 09:23:31 -07:00
Thomas Reynolds
913d2b7049
Implement generic which is a simple way to build a file from Rack
2013-06-13 09:05:13 -07:00
Thomas Reynolds
f97c9ffab1
dont bother with jruby 1.8 mode
2013-06-12 18:24:00 -07:00
Thomas Reynolds
7e405fc414
And by 1.8, I mean MRI 1.8
2013-06-12 17:58:59 -07:00
Thomas Reynolds
e03362e6f6
Apparently Ruby 1.8 doesn't have Proc.source_location
2013-06-12 17:40:17 -07:00
Thomas Reynolds
7d7d5e683e
Set current_engine on the context, not self, since we dup self and use that for each render loop. Closes #860
2013-06-12 15:21:31 -07:00
Moritz Breit
b234deb540
Add cucumber scenarios for markdown pages with erb layout
...
These are tests for middleman/middleman#860 .
2013-06-12 11:23:00 -07:00
Thomas Reynolds
a52effc119
continue forcing Padrino to html_safe everything
2013-06-12 11:19:02 -07:00
Karl Freeman
34b354f156
Update CONTRIBUTING.md
2013-06-10 18:20:09 +02:00
Thomas Reynolds
9d5a878713
prybegone
2013-06-09 17:15:15 -07:00
Thomas Reynolds
d71af3f5a1
Force padrino to skip safebuffer on erb
2013-06-08 15:36:14 -07:00
Thomas Reynolds
d9f8327dc6
Merge pull request #930 from utensil/master
...
fix #929 : `cd` in Rakefile in a cross-platform way
2013-06-07 10:09:23 -07:00
Thomas Reynolds
efc0f9961b
Merge pull request #927 from middleman/content_for_escaping
...
content_for is escaping .erb
2013-06-07 10:08:37 -07:00
Thomas Reynolds
c051b72322
Merge pull request #928 from middleman/capture_html-tests
...
capture_html helper tests
2013-06-07 10:07:31 -07:00
utensil
7e9ff77c1d
fix #929 : cd in Rakefile in a cross-platform way
2013-06-07 23:19:47 +08:00
Karl Freeman
ef46e4e6c3
add breaking test for escaped html using content_for
2013-06-07 09:59:59 +01:00
Karl Freeman
0b8c36cb8c
capture_html helper tests
2013-06-07 09:58:37 +01:00
Thomas Reynolds
d728df12cf
bump ver
2013-06-05 13:40:45 -07:00
Thomas Reynolds
265f90e240
Add callback so v4 extensions can see when other extensions are activated
2013-06-04 15:51:03 -07:00
Thomas Reynolds
f3e2e8fdf5
ignore vendor in simplecov
2013-06-04 14:28:46 -07:00
Thomas Reynolds
48ce4a8beb
Update vendor.yml
2013-06-04 15:23:01 -06:00
Thomas Reynolds
69c36e691f
use latest padrino
2013-06-04 09:56:33 -07:00
Thomas Reynolds
39d3fa01ad
Merge branch 'master' of github.com:middleman/middleman
2013-06-04 09:48:45 -07:00
Thomas Reynolds
a9839731e6
only require padrino once
2013-06-04 09:48:01 -07:00
Thomas Reynolds
d3d85f8bc7
Merge pull request #923 from pulletsforever/feature/rack-block
...
Allow block to be passed through from Middleman.server()
2013-06-03 13:35:01 -07:00
David W. Keith
f2f17c33b3
Allow block to be passed through from Middleman.server()
2013-06-03 11:48:16 -07:00
Thomas Reynolds
c741735446
update path to helpers for sitemap metapages
2013-06-03 10:07:09 -07:00
Thomas Reynolds
564af31987
Merge pull request #922 from middleman/ignore-vendor-folder
...
include '/vendor' in ignored files / folders
2013-06-03 09:57:13 -07:00
Karl Freeman
32b113dc93
include '/vendor' in ignored files / folders
2013-06-03 17:06:43 +01:00
Thomas Reynolds
8863473756
bump dep
2013-06-02 19:04:33 -07:00
Thomas Reynolds
d0cd3e3cf9
layouts_dir is now configurable. Closes #899
2013-06-01 15:25:44 -07:00
Thomas Reynolds
149f6ffa5b
fix builder not cleaning empty directories
2013-05-31 21:20:15 -04:00
Thomas Reynolds
9d50cad910
Merge branch 'master' of github.com:middleman/middleman
2013-05-31 21:01:34 -04:00
Thomas Reynolds
10f1d7ada2
break apart some methods to make code less complex
2013-05-31 20:46:12 -04:00
Thomas Reynolds
8cf25c7cc3
Merge pull request #920 from bhollis/empty
...
Add an "empty" template and let template classes override the "Gemfile" template.
2013-05-31 06:49:57 -07:00
Ben Hollis
85c6a8faa3
Fix changelog
2013-05-30 21:21:13 -07:00
Ben Hollis
dbcb28dded
Add an "empty" template and let template classes override the "Gemfile" template.
...
Custom template classes can define "self.gemfile_template" to return the path to their own Gemfile template, without having to reimplement our generate_bundler! task.
2013-05-30 21:17:43 -07:00
Ben Hollis
7127401aa2
Micro-optimize some regexes
2013-05-30 21:17:42 -07:00
Thomas Reynolds
fe2a7c4dd6
Merge branch 'master' of github.com:middleman/middleman
2013-05-31 00:11:54 -04:00
Ben Hollis
7bdf28a421
Fix ignoring layouts from the sitemap when the source directory has been set to something other than 'source'. Fixes #896 .
2013-05-30 20:17:58 -07:00
Ben Hollis
474b56ae25
Merge pull request #917 from joallard/i18n_pages
...
Fix #823-2 to allow only one extension on localized views
2013-05-30 18:39:13 -07:00
Thomas Reynolds
f4002dbb36
update changelog
2013-05-30 15:13:42 -04:00
Thomas Reynolds
403d6abd05
fix up simplecov, add coveralls
2013-05-30 13:38:52 -04:00
