747
038d2a64f7
Merge branch 'add_tests' into working
2014-05-05 06:01:07 +09:00
747
d1d3e8dba6
add tests on eponymous parent traversal
2014-05-02 06:06:55 +09:00
747
348417601b
quick fix for finding eponymous parents
2014-04-29 22:43:33 +09:00
Ben Hollis
299263c7e5
Merge pull request #1232 from lolmaus/patch-1
...
Webrick should not do reverse DNS lookups
2014-03-27 09:18:04 -07:00
Andrey 'lolmaus' Mikhaylov
db59447e82
Webrick should not do reverse DNS lookups
...
This prevents Middleman server from being terribly slow over network. Closes #1118 .
2014-03-27 11:58:31 +03:00
Thomas Reynolds
dd9c05f433
Merge pull request #1229 from bhollis/metadata
...
Improvements to the /__middleman/ metadata pages
2014-03-26 09:05:23 -07:00
Ben Hollis
4605ffc398
Improvements to the /__middleman/ metadata pages.
...
Includes formatting/styling changes to clarify the data being presented as well as align styling with middlemanapp.com. Also adds features and fixes to the sitemap view to show ignored files differently, hide redundant information, print data/options as a hash instead of as array pairs, and to list out available locals defined on a page.
2014-03-26 00:12:10 -07:00
Ben Hollis
97e7427641
Ignore .cache by default in .gitignore
2014-03-25 22:39:52 -07:00
Ben Hollis
bb5b4054ff
Don't bother processing asset hash on ignored resources. On a large project with a lot of Sprockets dependencies that were mostly ignored, this brought the build down from 30 minutes to 1 minute
2014-03-23 23:35:12 -07:00
Ben Hollis
0a6c80d223
Don't attempt to load local templates if HOME is not set
2014-03-23 16:49:22 -07:00
Thomas Reynolds
fde93ffed4
add node_modules to filewatcher ignore
2014-03-20 10:02:18 -07:00
Thomas Reynolds
ae1edd482f
upgrade to newest activesupport
2014-03-20 09:53:01 -07:00
Thomas Reynolds
515c91e826
Merge pull request #1219 from bhollis/windows
...
Add tzinfo-data for Windows users
2014-03-19 15:40:33 -07:00
Thomas Reynolds
4efefedb6f
Merge pull request #1218 from bhollis/ignore
...
Prevent the file watcher from recursively enumerating into paths that it should ignore
2014-03-19 15:40:27 -07:00
Ben Hollis
f71a0951ef
Add tzinfo-data for Windows users
2014-03-18 22:42:31 -07:00
Ben Hollis
67689e60d2
Prevent the file watcher from recursively enumerating into paths that it should ignore. This should fix the issue in #1197 as well as provide a performance boost when starting 'middleman server'.
2014-03-18 21:17:50 -07:00
Ben Hollis
6b7e995548
Merge pull request #1209 from arthurnn/travis_ci
...
Travis ci update
2014-03-18 20:02:51 -07:00
Arthur Neves
8eb544a3e7
Travis ci update
...
Test on 2.1.1
Dont allow failures on 2.1.x
2014-03-17 00:18:48 -04:00
Thomas Reynolds
485cf1aed0
Merge pull request #1205 from bhollis/lazy-v3
...
Avoid loading middleman-core unless needed (v3)
2014-03-14 09:30:16 -07:00
Ben Hollis
a88f12a262
Apply fix from 32716f3729 - avoid loading middleman-core unless needed. Fixes #1203
2014-03-13 20:32:25 -07:00
Ben Hollis
58616ce486
pry-debugger is not available on Ruby 2.1
2014-03-13 20:31:41 -07:00
Thomas Reynolds
250c87ef61
move livereload init into dev block
2014-03-09 17:50:34 -07:00
Thomas Reynolds
f5b3720ef8
Merge pull request #1190 from bhollis/middleman-core
...
Be quiet about missing extras when middleman-core is used alone
2014-03-03 10:50:10 -10:00
Ben Hollis
0533bc4209
Be quiet about missing extras when middleman-core is used alone
2014-02-25 22:28:06 -08:00
Ben Hollis
4e545eef27
Break Middleman::Extension into its own file, mirroring the change on master
2014-02-22 18:43:47 -08:00
Ben Hollis
12defbc56b
Merge pull request #1185 from bhollis/layout_priority
...
Prefer loading layouts from `layouts_dir`
2014-02-21 18:32:02 -08:00
Ben Hollis
477f87e98a
Prefer loading layouts from layouts_dir over layouts with the same name in the source root. This also includes a bunch of refactoring/cleanup of rendering.rb. Fixes #1176 .
2014-02-20 08:50:07 -08:00
Ben Hollis
ca50f21fac
"middleman init" will create a project in the current directory. Fixes #1181 .
2014-02-19 23:13:59 -08:00
Thomas Reynolds
3995ad850c
update padrino.
2014-02-18 18:30:29 -08:00
Thomas Reynolds
049866ee2e
Merge pull request #1169 from datapimp/before-build-hook
...
Adding before build hook
2014-02-05 09:29:19 -08:00
Jonathan Soeder
8d346e74a5
Adding before build hook
2014-02-04 23:03:24 -06:00
Thomas Reynolds
3b3ed654b7
Merge pull request #1167 from hagenburger/feature/upgrade-hooks-v3
...
Feature/upgrade hooks v3
2014-02-03 15:30:22 -08:00
Nico Hagenburger
0c3000c799
as there are no more local changes in the hooks’ source, it can be unvendored and used as gem
2014-02-03 23:39:23 +01:00
Nico Hagenburger
e5d95944c4
use instance hooks provided by hooks instead of changing the gem’s source
...
Conflicts:
middleman-core/lib/middleman-core/core_extensions/extensions.rb
2014-02-03 23:37:55 +01:00
Nico Hagenburger
732532b72e
upgraded hooks to 0.3.3; integrated custom changes as made for 0.2.0
...
Conflicts:
middleman-core/lib/middleman-core/application.rb
2014-02-03 23:34:31 +01:00
Thomas Reynolds
cb87e70a72
Merge pull request #1163 from jagthedrummer/jeremy/console-fix
...
Update the console to the new logger syntax.
2014-01-31 09:19:49 -08:00
Jeremy Green
b056f4f1d1
Update the console to the new logger syntax.
2014-01-30 23:26:17 -06:00
Thomas Reynolds
f0fcebe169
disable sass cache since it cant marshal the path to the MM instance
2014-01-28 10:46:39 -08:00
Thomas Reynolds
c2d85c35f2
prep release
2014-01-27 09:56:48 -08:00
Thomas Reynolds
277721ee1c
Merge pull request #1160 from minivan/template-link-fix
...
Fix dynamic pages link in the config template
2014-01-27 09:49:10 -08:00
Thomas Reynolds
4bc9079470
Merge pull request #1161 from nybblr/v3-stable
...
Update Uglifier to 1.4.0 in middleman.gemspec
2014-01-27 09:48:43 -08:00
Ivan Zarea
3993034883
Fix dynamic pages link in the config template
2014-01-27 09:35:30 +02:00
Jonathan Martin
674c3eed0e
Update middleman.gemspec
...
Bump Uglifier.
2014-01-24 21:24:45 -05:00
Thomas Reynolds
2e2415612a
spring cleaning util and discovery of nasty variable mutating in url_for
2013-12-31 14:41:17 -08:00
Karl Freeman
3cc74aae7e
whitespace [ci skip]
2013-12-30 21:39:28 +00:00
Karl Freeman
dcf527008e
StringLiterals 'cop' fix [ci skip]
2013-12-29 23:04:30 +00:00
Karl Freeman
f6f235c1fe
exclude development gems
2013-12-29 22:53:18 +00:00
Karl Freeman
b0a5722b34
use latest bundler
2013-12-29 22:45:43 +00:00
Karl Freeman
1de2f5c290
TRAVIS environment variable already set
...
http://about.travis-ci.org/docs/user/ci-environment/#Environment-variables
2013-12-29 13:01:33 +00:00
Ben Hollis
2a89de8e2b
Merge pull request #1128 from coffeencoke/fixes_call_to_newline_constant
...
Specify the full path to the NEWLINE constant
2013-12-28 19:09:03 -08:00
