Commit graph

2498 commits

Author SHA1 Message Date
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
Thomas Reynolds a4807496ed Merge pull request #1640 from tommysanterre/Fix_issue_1601_unitialized_constant_on_windows
Add some requires to help #1601
2015-10-19 15:32:30 -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
Thomas Reynolds 58e794645b Merge pull request #1633 from dg-ratiodata/feature/preven_crash_due_to_invalid_data_file
Refactor Data Loader to prevent middleman from crashing due to invalid…
2015-10-09 12:41:26 -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 4d46b84aae Do not run specs if there is no spec directory 2015-10-07 15:59:12 +03:00
Alexey Pokhozhaev b9cdc2bba4 Run cucumber if features directory exists + removed unused task 2015-10-07 15:29:34 +03:00
Alexey Pokhozhaev 3a7848da9e Little bit cleaned up. Dry in rake tasks. Fix $LOAD_PATH 2015-10-07 14:33:56 +03:00
Thomas Reynolds 8292bc9899 Merge pull request #1625 from ajsharp/patch-1
Add Errno::ENETUNREACH to exception list in BasicNetworkResolver
2015-10-05 20:47:19 -07:00
Alex Sharp 9a529cd294 Add Errno::ENETUNREACH to exception list in BasicNetworkResolver
Fixes #1621
2015-10-05 11:08:52 -07:00
Thomas Reynolds 529bcca927 Merge pull request #1623 from boone/spellcheck
Fixed typos.
2015-10-05 08:21:06 -07:00
Mike Boone 5a4d7352f1 Fixed typos. 2015-10-04 20:59:53 -04:00
Thomas Reynolds 99c2362ee8 Merge pull request #1616 from y-yagi/reomve_unnecessary_require
remove unnecessary require
2015-10-04 11:50:46 -07: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
Thomas Reynolds a064ba93b3 Merge pull request #1613 from ne-sachirou/fix/clean_under_hidden_dir
Fix: Can't clean files when the project is under a hidden directory.
2015-09-30 23:57:05 -07: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
Thomas Reynolds 41255e6727 Merge pull request #1599 from nslocum/v3-stable
Ignore gems installed in local dir.
2015-09-17 09:03:51 -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
Thomas Reynolds 8a349322ac Merge pull request #1593 from komor72/patch-1
Update middleman-livereload version to more current
2015-09-03 10:09:54 -07: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 7a28fd0a50 disable osx builds for now 2015-08-31 11:25:22 -07: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
Thomas Reynolds 60d88139af Merge pull request #1588 from bradgessler/patch-1
Fix typo in server CLI.
2015-08-28 15:29:13 -07:00
Brad Gessler 8bdeab50ee Fix typo in server CLI. 2015-08-28 13:08:56 -07:00
Thomas Reynolds 23cf612dd9 bump sprockets branch 2015-08-12 10:51:06 -07:00
Thomas Reynolds dcbeb7dc76 Remove fivemat 2015-08-06 11:06:34 -07:00
Thomas Reynolds b0c90e1192 Merge pull request #1580 from maxmeyer/feature/bump_cucumber
Bump version of cucumber
2015-08-06 10:35:27 -07:00
Max Meyer dc4057d8dc Bump version of cucumber 2015-08-05 22:51:25 +02:00
Ash Furrow fa3a95fa23 Fixes problem with after_render hooks returning nil. 2015-08-01 18:09:14 -04:00
Thomas Reynolds 837a679aa7 bump thor 2015-07-24 14:51:20 -07:00
Thomas Reynolds a528659034 Bump listen to 3.0 2015-07-24 14:20:04 -07:00
Thomas Reynolds 7bfacd565a Update change log 2015-07-24 13:48:43 -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
Thomas Reynolds 1d69bcd4bc Merge pull request #1567 from mauro-oto/fix_rubocop_warnings
Fix rubocop warnings
2015-07-20 09:09:02 -07:00
Mauro Otonelli dcc52d967c Applied Rubocop feedback. 2015-07-19 20:45:45 -03:00
Mauro Otonelli c11a9e6f39 Removed invalid Rubocop blocks. 2015-07-19 20:45:10 -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
Eliott Appleford a855b634e6 Merge pull request #1560 from mauro-oto/remove_active_support_json
Drop active_support's JSON in favor of native JSON implementation
2015-07-15 12:03:06 +01:00
Mauro Otonelli d18e5ed973 Locked aruba to ~> 0.7.4, as 0.8 (latest) breaks the build. 2015-07-14 21:32:52 -03: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