Commit graph

657 commits

Author SHA1 Message Date
Arron Mabrey
44e5ff3f6c Update Sitemap source_dotfiles to support .nojekyll file 2013-06-30 18:46:39 -04:00
Arron Mabrey
00d6a78872 Add expectation that .nojekyll file should exist to directory_index feature 2013-06-30 18:45:49 -04:00
Arron Mabrey
0d4dd71ae2 Add .nojekyll file to indexable-app fixture 2013-06-30 18:44:34 -04:00
Alan Larkin
26b7f46978 Fixed typo in middleman-core/core-extensions/request.rb. 2013-06-25 14:55:12 +01:00
Thomas Reynolds
b2ecf5526b ignore all ds_store 2013-06-24 14:26:58 -07:00
Thomas Reynolds
b6a73ccfe5 prep 2013-06-24 14:15:27 -07:00
Thomas Reynolds
c7d3e7d601 Fix regex which was allowing i18n to file yaml files in the data folder 2013-06-24 13:56:32 -07:00
Thomas Reynolds
37752dc291 fix layouts with implied extensions 2013-06-24 13:39:14 -07:00
Thomas Reynolds
3399ee207e dont hardcode ignored build dir name 2013-06-23 15:15:43 -07:00
Steve Faulkner
f68f01a574 Update gitignore 2013-06-22 22:53:10 -05:00
Thomas Reynolds
d86dffa7c6 implement redirect support 2013-06-19 11:13:23 -07:00
Thomas Reynolds
912b33929f bump listen 2013-06-19 10:23:53 -07:00
Thomas Reynolds
0415b76d4f tests for content_tag escaping 2013-06-18 11:12:41 -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
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
Thomas Reynolds
d71af3f5a1 Force padrino to skip safebuffer on erb 2013-06-08 15:36:14 -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
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
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
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
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
Thomas Reynolds
403d6abd05 fix up simplecov, add coveralls 2013-05-30 13:38:52 -04:00
Jonathan Allard
56f16c2488 Fix #823-2 to allow only one extension on localized views
Make Sitemap::Store#strip_away_locale actually do something
2013-05-30 13:37:31 -04:00