Commit graph

2640 commits

Author SHA1 Message Date
Thomas Reynolds ce2d5028b2 Merge pull request #1445 from alex88/patch-1
Add Woff2 to asset hash extensions
2015-02-24 09:50:51 -07:00
Thomas Reynolds a3772428c1 Merge pull request #1456 from yterajima/feature/add-template-test
Add test to `$ middleman init` using tmeplate
2015-02-23 12:30:11 -08:00
Thomas Reynolds 973f79a103 Dropping ruby 1.9.x support 2015-02-23 12:29:51 -08:00
Eliott Appleford e2ae2e5e42 Merge pull request #1468 from vassilevsky/fix-grammar
Fix grammar in a scenario
2015-02-23 16:52:01 +00:00
Ilya Vassilevsky 4d75ba7749 Fix grammar in a scenario 2015-02-23 01:53:14 +03:00
yterajima ceb4769325 Add test to $ middleman init using tmeplate
* using Middleman directory
* using github
    * user/repository
    * user/repository#branch
* using full path
    * contains "://"
2015-02-19 01:02:21 +09:00
Thomas Reynolds 13a24d99ba Merge pull request #1449 from alex88/feature/git-ssh-template-source
Clone templates from ssh 'git@' urls
2015-02-13 09:25:06 -08:00
Alessandro Tagliapietra bf9f94989d Clone templates from ssh 'git@' urls 2015-02-13 10:08:09 +01:00
Thomas Reynolds 5cb880064d Merge pull request #1448 from alex88/feature/git-url-template
Clone template from full repository urls
2015-02-12 09:27:22 -08:00
Alessandro Tagliapietra 640c87c13a Clone template from full repository urls 2015-02-12 15:40:54 +01:00
Alessandro Tagliapietra 3c5c677a07 Add Woff2 to relative assets extension 2015-02-11 00:09:40 +01:00
Alessandro Tagliapietra d97e380db8 Add Woff2 to builder asset order 2015-02-10 23:58:29 +01:00
Alessandro Tagliapietra 19db9f3be1 Add Woff2 to asset hash extensions 2015-02-10 23:30:20 +01:00
Thomas Reynolds 986b9fcf51 Merge pull request #1444 from joost/patch-2
Add :overwrite option to gzip
2015-02-10 14:02:48 -08:00
Joost Hietbrink 28199950e9 Add :overwrite option to gzip
Useful for deployment to S3 together with gzip content-encoding.
2015-02-10 21:49:15 +01:00
Thomas Reynolds 04da75a2eb Merge pull request #1443 from hagenburger/allow-custom-option
don’t override :custom if already set
2015-02-10 07:14:15 -08:00
Nico Hagenburger 98b06878a5 fixed space 2015-02-10 09:28:31 +01:00
Nico Hagenburger a5c65bac53 don’t override :custom if already set
Sometimes Sprockets needs to access
`options[:custom][:sprockets_context]`. If this is set, it should not be
overridden. This happens when building a LivingStyleGuide file when the
Sass source uses `asset-path`, `image-url` or similar functions.
2015-02-09 23:16:20 +01:00
Thomas Reynolds e4b7d4fff0 begin prepping beta.1 2015-02-07 13:38:29 -08:00
Thomas Reynolds b666a7aaee Merge pull request #1434 from joost/patch-1
Fix 404 for sub-mounted apps
2015-01-26 10:40:48 -08:00
Joost Hietbrink 7bec48c688 Fix 404 for sub-mounted apps
404 now shows full path (similar to url).
2015-01-26 14:33:22 +01:00
Thomas Reynolds 46ebc9d518 Merge pull request #1427 from stevenosloan/add_specs_for_recursively_enhance
add specs for #1426 & reorganize Middleman::Util specs to a single file
2015-01-15 23:02:29 +00:00
Steven Sloan 9ba1dc040f reorganize all Middleman::Util specs to a single spec file, add specs for PR #1426 2015-01-15 13:29:37 -05:00
Thomas Reynolds f02713788d fix strange change to how file contents are checked in aruba 2015-01-15 09:56:28 +00:00
Thomas Reynolds 0409c5bcbe Merge pull request #1426 from stevenosloan/standardize_recursively_enhance_for_hash_with_indifferent_access
Standardize recursively enhance for hash with indifferent access
2015-01-15 09:43:13 +00:00
Steven Sloan 14e1cb1cd6 move all HashWithIndifferentAccess recursive enhancement over to the Util class
TODO: moving this two a class method on HashWithIndifferentAccess would really make the most sense, but there are two blockers:
- historically the method has operated out of Util. While totally ok, simply dedeferring to HashWithIndifferentAccess feels a bit awkward
- the contracts gem doesn’t support class method at this time. the assurance of frozen output is important considering the uses of the recursively_enhance method
2015-01-15 03:30:26 -05:00
Steven Sloan a771b15700 rewrite CoreExtension::Data#key? to prevent potential SystemStackError
since data_for_path can trigger respond_to?, and respond_to? uses key? — a SystemStackError could trigger if data_for_path was called.
2015-01-15 02:46:59 -05:00
Thomas Reynolds ddc048e075 swap rbx for another jruby 2015-01-04 16:10:58 -06:00
Thomas Reynolds 69f8245f7b bump 2015-01-04 15:42:22 -06:00
Thomas Reynolds 39c7c9df54 fix leftover flag 2015-01-04 15:28:13 -06:00
Thomas Reynolds 857c99fab5 attempt to fix interactive cli timeout 2015-01-04 15:23:37 -06:00
Thomas Reynolds 8e743aea94 fix interactive init test 2015-01-04 15:06:14 -06:00
Thomas Reynolds 96e05128a1 attempt to improve travis perf 2015-01-04 14:42:06 -06:00
Thomas Reynolds f16510d034 Update CLI 2015-01-04 14:23:35 -06:00
Thomas Reynolds 302a891bbb Update some deps 2015-01-03 14:32:21 -06:00
Thomas Reynolds eb1a658b25 over calling change callbacks which are unnecessary. 2014-12-26 14:11:58 -08:00
Thomas Reynolds ef0b996004 blog compat 2014-12-24 11:38:54 -08:00
Thomas Reynolds ee4c68b03c prep alpha, backwards compat 2014-12-23 14:54:21 -08:00
Thomas Reynolds d8e8b06cb6 merge v3 2014-11-19 09:04:56 -08:00
Thomas Reynolds 17eb54b9dc Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable 2014-11-16 12:42:58 -08:00
Thomas Reynolds ab567b1cbd Merge pull request #1405 from dennisreimann/asset_hash-srcset
Asset hashing for image references in srcset
2014-11-16 12:42:51 -08:00
Thomas Reynolds 3eafb4fcf4 Merge branch 'v3-stable' of github.com:middleman/middleman into v3-stable 2014-11-16 12:35:45 -08:00
Dennis Reimann e28ed20c63 Asset hashing for image references in srcset
Fixes #1287
2014-11-16 21:25:28 +01:00
Thomas Reynolds 20552164aa Merge pull request #1404 from blech75/ignore_git_dir_on_init
exclude .git folder when init'ing a local template
2014-11-13 14:33:01 -08:00
justin blecher dcca8968c8 exclude .git folder when init'ing a local template
freshly init'd middleman projects from a local template should not
include the git files from that template because that's confusing.
this is to help users who clone git repos into `~/.middleman/`.
2014-11-12 19:12:52 -05:00
Thomas Reynolds be98103e05 An attempt to fix #1402 2014-11-09 11:30:11 -08:00
Thomas Reynolds c231e00f00 bump 2014-11-08 21:06:17 -08:00
Eliott Appleford 4f93adffcc Merge pull request #1401 from claudiob/bring-fix-1582-from-padrino-against-v3-stable
Import patch to bugfix from Padrino Helpers
2014-11-08 22:22:25 +00:00
claudiob 9d49b08426 Import patch to bugfix from Padrino Helpers
Padrino had an issue https://github.com/padrino/padrino-framework/issues/1582
which was solved at 72769fe39a (diff-526024418d0d573e08d46ba3d55c02bcR36)

This commit brings the same fix back into Middleman's method that
overrides Padrino's method.
2014-11-08 13:01:13 -08:00
Thomas Reynolds ebe2164fe9 Merge pull request #1398 from maxmeyer/feature/switch_current_working_dir
Switch to current working directory during testing
2014-11-03 08:02:48 -08:00