Ben Hollis
f29994e25a
Fix tests after Padrino 0.12.2 release
2014-05-15 23:35:09 -07: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 `
content ||= ''
content.gsub! '&', '&'
content
end
2014-05-11 14:06:04 -04:00
Thomas Reynolds
2dd87bab74
Fix combo of compass-import-once and sass-globs. Closes middleman/middleman-sprockets#56
2014-05-01 10:01:45 -07:00
Thomas Reynolds
8eabe4d354
rubocop 2: the reckoning
2014-04-29 10:44:24 -07:00
Thomas Reynolds
04dc48f13d
Great rubocop-ing
2014-04-28 16:02:18 -07:00
Thomas Reynolds
8f75f6516d
back out IP detection
2014-04-14 10:34:53 -07:00
Thomas Reynolds
419a81fffb
Merge pull request #1256 from fabianrbz/fix_rubocop_config
...
Fix rubocop config.
2014-04-14 10:15:13 -07:00
Fabian Rodriguez
0656cd6a31
Fix rubocop config.
...
Since rubycop v0.20.0 'AllCops/Excludes' and 'AllCops/Includes' where renamed to
'AllCops/Exclude' and 'AllCops/Include'
2014-04-12 18:28:13 -03:00
Thomas Reynolds
9d0eb72e73
Merge pull request #1254 from Arcovion/patch-1
...
Change default IP for CLI server
2014-04-11 09:39:54 -07:00
Eliott Appleford
a50ca3a49d
Change default IP
...
Enables #1248 by default.
2014-04-11 14:48:12 +01:00
Thomas Reynolds
dc3d4f9fd5
bump activesupport
2014-04-09 16:12:57 -07:00
Thomas Reynolds
a5c2386853
match masters new logger ref
2014-04-07 16:47:06 -07:00
Thomas Reynolds
bbd9913372
Update changelog [ci skip]
2014-04-07 11:03:13 -07:00
Thomas Reynolds
69c6e87b31
bump
2014-04-07 09:56:15 -07:00
Thomas Reynolds
1b3b785c2b
Merge pull request #1248 from Arcovion/patch-1
...
Mobile friendly host & windows fix
2014-04-07 09:49:36 -07:00
Thomas Reynolds
4c9af0e07d
Merge pull request #1251 from railsbros-dirk/fix-middleman-init-command
...
CLI: Always require 'middleman-core/version'
2014-04-07 09:48:48 -07:00
Thomas Reynolds
fcbf9f1568
avoid running Sass compilation twice
2014-04-07 09:38:00 -07:00
Dirk Breuer
ae451608b3
CLI: Always require 'middleman-core/version'
...
The `init` command will fail if the `VERSION` was not required because
it is needed for the Gemfile generation. Unfortunately this was not
catched by the specs because the specs require the version and the child
process is not correctly reset.
I was not able to change this easily :-(
2014-04-07 16:15:50 +02:00
Eliott Appleford
e3946a06d9
Print correct IP and mobile testing support
...
Address `0.0.0.0` wasn't valid on windows, use localhost instead
Finds a local IP that will also allow the development server to run on mobiles
2014-04-05 21:55:01 +01:00
Thomas Reynolds
a40ef1a734
bump to include sass fix
2014-04-05 13:38:45 -07:00
Thomas Reynolds
7ae4c4d14e
use compass-import-once
2014-04-04 17:02:22 -07:00
Thomas Reynolds
f95da2a1da
arbua jruby support
2014-04-04 10:56:47 -07:00
Thomas Reynolds
3cb320abdf
Add Karl to authors list
2014-04-04 10:50:35 -07:00
Thomas Reynolds
f3edabfb7e
bump execjs dep
2014-04-04 10:48:08 -07:00
Thomas Reynolds
dae133949d
bump copyright
2014-04-04 10:42:11 -07:00
Thomas Reynolds
80256ec3c5
revert back to sass 3.2 and stable compass
2014-04-04 10:38:50 -07:00
Thomas Reynolds
bf62454dc2
bump uglifier dep
2014-04-04 10:31:11 -07:00
Thomas Reynolds
638e2e64b7
Unvendor padrino
2014-04-04 10:22:34 -07:00
Thomas Reynolds
28e39933e8
Notify slack
2014-04-03 14:48:30 -07:00
Thomas Reynolds
f800a51fb2
Update haml and sass deps
2014-04-03 09:53:33 -07:00
Thomas Reynolds
142d1b1871
Merge pull request #1234 from kaleworsley/more_details_in_the_instrumentation_payload
...
Include the destination_path in the instrumentation payload.
2014-03-28 10:33:50 -07:00
Kale Worsley
6f38416c15
Include the destination_path in the instrumentation payload.
2014-03-28 09:10:33 -07: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