dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,268 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

7268 Commits

Author SHA1 Message Date
Parker Moore de5970ae55 Fix some minor things in the tests 2016-05-24 18:49:05 -05:00
Parker Moore d84844c223 Freeze configuration defaults & duplicate in deep_merge_hashes if need be. 2016-05-24 18:49:05 -05:00
Parker Moore ad59b6e62a Remove merge conflicts I forgot to fix. 2016-05-24 18:49:02 -05:00
Parker Moore 37b93f10dd Add missing 'end' to test/helper.rb 2016-05-24 18:47:15 -05:00
Parker Moore 59346eb228 Remove call to #backwards_compatibilize in Configuration.from 2016-05-24 18:47:15 -05:00
Parker Moore 8af77643c5 Site#site_payload: sort collections by label 2016-05-24 18:47:15 -05:00
Parker Moore f52a0e7200 Configuration#add_default_collections: fix bug where DEFAULTS['collections'] is modified 2016-05-24 18:47:15 -05:00
Parker Moore d01f7943de Add Configuration.from & use in Jekyll.configuration. 
This process streamlines the creation of new configurations. Creating a new
site will choke if not all the correct options are given.
Configuration.from will ensure the overrides have all string keys and
ensures all the common issues & defaults are in place so a Site can be
created.

A common use:

    config = Configuration.from({ 'permalink' => '/:title/' }) # etc
    site = Jekyll::Site.new(config)
 2016-05-24 18:47:15 -05:00
Parker Moore fab092fcec Remove use of Marshal in runtime code. 2016-05-24 18:47:15 -05:00
Parker Moore 4e06f07ad4 Add tests for Configuration#add_default_collections 2016-05-24 18:47:14 -05:00
Parker Moore 6eaa8e90f8 Don't read a config file if the filename is empty. 2016-05-24 18:47:14 -05:00
Parker Moore 04d4473119 Use Marshal to duplicate configuration defaults to prevent manipulation 2016-05-24 18:47:14 -05:00
Parker Moore dbcbf809ff Refactor some tests to prevent manipulation of Jekyll::Config::DEFAULTS 2016-05-24 18:47:04 -05:00
Parker Moore f2263a11b7 Only write collections.posts.permalink if permalink is set. 2016-05-24 18:40:19 -05:00
Parker Moore c69ca4c11e Test#build_configs shouldn't overwrite default collections 2016-05-24 18:40:19 -05:00
Parker Moore e02049727b
Update history to reflect merge of #4916 
[ci skip]
 2016-05-23 13:44:00 -07:00
jekyllbot 6eaf2634f2 Merge pull request #4916 from brint/rubocop_cleaning 
Merge pull request 4916
 2016-05-23 13:36:48 -07:00
Brint O'Hearn dbda462c2f Adding double quotes & freeze back to version after rebase 2016-05-20 21:51:16 -05:00
Brint O'Hearn 6db5272528 Splitting args onto own lines in test/test_static_file.rb 
For functions where the character limit was exceeded
and line wrapping was needed, this commit just splits
each arg into it's own line.
 2016-05-20 21:24:34 -05:00
Brint O'Hearn 281a873c71 lib/jekyll/utils/platforms.rb didn't have any rubocop errors 2016-05-20 21:24:34 -05:00
Brint O'Hearn d743c80357 Rubocop fixes for lib/jekyll/utils/ansi.rb 2016-05-20 21:24:34 -05:00
Brint O'Hearn e85f2a0ee9 Rubocop fixes for lib/jekyll/version.rb 2016-05-20 21:24:34 -05:00
Brint O'Hearn 8f07affe2a Rubocop fixes for test/test_related_posts.rb 2016-05-20 21:23:29 -05:00
Brint O'Hearn a9f110b861 Rubocop fixes for test/test_sass.rb 2016-05-20 21:23:29 -05:00
Brint O'Hearn 16c1146b4f Rubocop fixes for test/test_static_file.rb 2016-05-20 21:23:29 -05:00
Brint O'Hearn 1380836a4b Rubocop fixes for test/test_theme.rb 2016-05-20 21:23:29 -05:00
Brint O'Hearn 013e2f159d Rubocop fixes for test/test_url.rb 2016-05-20 21:23:29 -05:00
Parker Moore 498324bbff
Release 💎 3.2.0.pre.beta1 2016-05-20 19:19:26 -07:00
Parker Moore 51c4152919
Release a beta. 2016-05-20 19:19:21 -07:00
jekyllbot cd31761f9a Update history to reflect merge of #4848 [ci skip] 2016-05-19 22:13:05 -07:00
jekyllbot ee2c41ad6a Merge pull request #4848 from jekyll/new-theme-command 
Merge pull request 4848
 2016-05-19 22:13:05 -07:00
Parker Moore f3a29677f9
Fix rubocop issues. 2016-05-19 21:34:30 -07:00
Parker Moore f2d08cf138
Correct variable reference. 2016-05-19 17:15:33 -07:00
Parker Moore ca0b1f7ea6
Add note about {{ layout }} to site. 2016-05-19 14:44:00 -07:00
Parker Moore 12deccc513
Only spec.summary is needed... 2016-05-19 14:39:55 -07:00
Parker Moore 20110571ef
Add a Rakefile to do releases as well as adding an example website. 2016-05-19 14:36:01 -07:00
Parker Moore 3885057e9e
Fix rubocop offense. 2016-05-19 13:16:32 -07:00
Parker Moore 1d81d2087e
Add info about 3.1.6 to master. 2016-05-19 12:54:04 -07:00
Parker Moore 5949b4a5bb
Add release information for v3.1.5 2016-05-18 21:38:53 -07:00
Parker Moore eb14b88175
Port forward the release information for v3.1.4 2016-05-18 17:16:52 -07:00
jekyllbot 952947c65e Update history to reflect merge of #4903 [ci skip] 2016-05-17 11:07:42 -07:00
jekyllbot cb80934277 Merge pull request #4903 from jehartzog/fix-pagination-docs 
Merge pull request 4903
 2016-05-17 11:07:42 -07:00
EricH eab2b438c9 Replaced markdown ` with <code> inside HTML block 2016-05-17 13:54:42 -04:00
jekyllbot 66e5453c35 Update history to reflect merge of #4902 [ci skip] 2016-05-17 08:00:00 -07:00
jekyllbot 9e92061eb3 Merge pull request #4902 from brint/rubocop_cleanup_tests 
Merge pull request 4902
 2016-05-17 07:59:59 -07:00
Brint O'Hearn ce9a8cb0f2 Moving url to local var for better readability 2016-05-16 20:42:59 -05:00
Brint O'Hearn df585aa5c6 Moving expected output into variable to make asserts more readable 2016-05-16 20:13:50 -05:00
Brint O'Hearn b006810f17 Moving .with down one line 4x times 2016-05-16 19:59:13 -05:00
Brint O'Hearn 98eef8af95 Aligning hashes per 2caff75 2016-05-16 19:48:04 -05:00
Brint O'Hearn 211c16003e test/test_exerpt.rb variable assignment cleanup 2016-05-16 19:39:43 -05:00