Commit graph

989 commits

Author SHA1 Message Date
Thomas Reynolds
9dc144e9f7 Disable stylus test 2015-12-10 13:22:46 -08:00
Thomas Reynolds
67f612a082 Merge pull request #1555 from skybon/patch-1
Remove showtitle attribute from asciidoc renderer
2015-11-27 15:31:35 -08:00
Thomas Reynolds
18b12eedcf Merge pull request #1679 from dg-ratiodata/feature/upgrade_aruba
Upgrade to aruba 0.10.x [WIP]
2015-11-27 14:12:16 -08:00
Steven Sloan
30335091c8 fix(default_helpers): allow asset_url to work outside of a resource context
This way calls from extensions/etc can call app.asset_url() and get the correct
path back.

Additionally, an exception will be raised if also using relative assets as the current resource
will be needed in that case.
2015-11-12 15:27:26 -05:00
Thomas Reynolds
fe4d3a4bb3 Merge pull request #1681 from maxmeyer/feature/server_hook_v3
Add "before_server"-hook to preview server in v3
2015-11-11 13:49:57 -08:00
Thomas Reynolds
78fb92d497 Adapt to upstream hooks API change. Fixes #1658 2015-11-11 13:25:17 -08:00
Dennis Günnewig
4e9ae8cc42 Before server hook 2015-11-11 21:49:37 +01:00
Dennis Günnewig
1d2126b9f7 Move HTTPS to server information 2015-11-11 21:39:54 +01:00
Dennis Günnewig
741caab546 Make middleman compatible with aruba 0.10.x 2015-11-09 14:46:48 +01:00
Landon Schropp
d67e5f512b Add missing require to default_helpers.rb
Helps resolve #1673
2015-11-02 20:56:39 -08:00
Thomas Reynolds
5f69431a74 Merge pull request #1614 from poporul/v3-stable
Little bit cleaned up. Dry in rake tasks. Fix $LOAD_PATH
2015-10-22 19:56:24 -07:00
Tommy Santerre
546cadf4fd Add some requires to help #1601 2015-10-17 21:53:47 -04:00
Thomas Reynolds
db1e8b8611 add a specific require. hopefully helping #1601 2015-10-17 14:06:50 -07:00
Dennis Günnewig
492281f9e8 Refator Data Loader to prevent middleman from crashing due to invalid data file 2015-10-09 12:15:09 +02:00
Alexey Pokhozhaev
3a7848da9e Little bit cleaned up. Dry in rake tasks. Fix $LOAD_PATH 2015-10-07 14:33:56 +03:00
Alex Sharp
9a529cd294 Add Errno::ENETUNREACH to exception list in BasicNetworkResolver
Fixes #1621
2015-10-05 11:08:52 -07:00
Mike Boone
5a4d7352f1 Fixed typos. 2015-10-04 20:59:53 -04:00
yuuji.yaginuma
65a65b9677 remove unnecessary require
`require 'rubygems'` is already required in Ruby 1.9 or later.
2015-10-03 10:06:52 +09:00
inoue_sachiro
2aac804e92 Fix: Can't clean files when the project is under a hidden directory. 2015-09-30 21:23:27 +09:00
Thomas Reynolds
2870647097 Merge pull request #1578 from ashfurrow/after_render-fix
Fixes problem with after_render hooks returning nil.
2015-09-17 09:35:37 -07:00
Nick Slocum
c09b15a895 specify the root directory. 2015-09-13 11:05:11 -04:00
nslocum
10feaad451 Ignore gems installed in local dir. 2015-09-11 08:42:52 -04:00
Rafał Komorowski
0d4d82a01a Update middleman-livereload version to more current
As discussed https://github.com/middleman/middleman-livereload/issues/69 but I forgot to apply the fix to source code inside MM. @tdreyno, should it be `~> 3.3.0` or `~> 3.4.0`? I looked into 3.4 changes and they seem to be MM v4 related?
2015-09-03 18:25:43 +02:00
Thomas Reynolds
5cab7c46a9 Store intermediate resources in reducer so the array is not empty the first run. Addresses #1590 2015-08-31 11:18:45 -07:00
Brad Gessler
8bdeab50ee Fix typo in server CLI. 2015-08-28 13:08:56 -07:00
Thomas Reynolds
dcbeb7dc76 Remove fivemat 2015-08-06 11:06:34 -07:00
Ash Furrow
fa3a95fa23 Fixes problem with after_render hooks returning nil. 2015-08-01 18:09:14 -04:00
Thomas Reynolds
a528659034 Bump listen to 3.0 2015-07-24 14:20:04 -07:00
Dennis Günnewig
63e9cd9b5f Substitue whitespace in name 2015-07-24 13:48:32 -07:00
Thomas Reynolds
c69099c451 Really fix #1568 2015-07-24 13:46:33 -07:00
Thomas Reynolds
0a8ceb24b0 Add test for #1568 2015-07-20 12:13:10 -07:00
Mauro Otonelli
dcc52d967c Applied Rubocop feedback. 2015-07-19 20:45:45 -03:00
Eliott Appleford
4364d754a5 Merge pull request #1564 from mauro-oto/remove_dir_related_deprec_warnings
Removed most deprecation warnings from the build.
2015-07-17 01:07:17 +01:00
Thomas Reynolds
d2f8dc9932 Merge pull request #1528 from maxmeyer/feature/listener
Support Bind to address for middleman
2015-07-16 15:12:09 -07:00
Thomas Reynolds
df13c62a6b Revert "Attempt to help #1563"
This reverts commit 55f909d9cf.
2015-07-16 11:34:46 -07:00
Mauro Otonelli
68a6eacc33 Removed most deprecation warnings from the build. 2015-07-15 22:03:41 -03:00
Thomas Reynolds
55f909d9cf Attempt to help #1563 2015-07-15 14:08:51 -07:00
Mauro Otonelli
63d6a00ed9 Use native Ruby JSON implementation instead of ActiveSupport's. 2015-07-14 19:30:17 -03:00
Mauro Otonelli
c14fd72d04 Remove unused integer/inflections extension. 2015-07-14 19:26:59 -03:00
Artem Vorotnikov
2b449bc398 Remove showtitle attribute from asciidoc renderer 2015-07-05 09:19:10 +03:00
Max Meyer
6aa7ce741a Refactor preview server to support server_name and bind_address 2015-07-01 20:56:56 +02:00
Max Meyer
232aca91bc Make testing a little bit easier and require features-directory to make subdirectories in cucumber work 2015-07-01 20:56:48 +02:00
Thomas Reynolds
724e249b49 Experiment with activersupport bump 2015-06-23 15:53:12 -07:00
Thomas Reynolds
9abcdaa7f7 Experiment with activersupport bump 2015-06-23 15:49:36 -07:00
Thomas Reynolds
8bbda9ea7b Whoops again 2015-06-22 11:28:09 -07:00
Thomas Reynolds
709a0d1a6c Fix previous commit 2015-06-22 10:48:40 -07:00
Thomas Reynolds
3fca2c6961 Add relative argument to stylesheet and javascript helpers. Closes #1539 2015-06-22 10:37:17 -07:00
Thomas Reynolds
e09f7fadb5 Add better error messaging for #1541 2015-06-15 09:58:29 -07:00
Eliott Appleford
70d4671d2c Allow extended globs with ignore
This makes it match the default behaviour of Dir#glob
2015-06-14 12:16:34 +01:00
Thomas Reynolds
6562716aa5 bone head move 2015-06-09 10:42:41 -07:00