Commit graph

2418 commits

Author SHA1 Message Date
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 &amp;#96;
  content ||= ''
  content.gsub! '&amp;', '&'
  content
end
2014-05-11 14:06:04 -04:00
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
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
747 348417601b quick fix for finding eponymous parents 2014-04-29 22:43:33 +09: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