f26cdd8da4
Create #mock_expects that goes directly to RSpec Mocks.
2015-04-14 14:20:55 -05:00
6dcdf06c8a
Update history to reflect merge of #3657 [ci skip]
2015-04-14 10:15:20 -07:00
e19d6c3f7e
Merge pull request #3657 from arthurnn/minitest_v
...
Merge pull request 3657
2015-04-14 10:15:01 -07:00
62cfd45d79
Force minitest version
...
[related #3656 ]
2015-04-14 12:22:13 -04:00
ab35d32feb
Update history to reflect merge of #3467 [ci skip]
2015-04-13 12:17:32 -04:00
d870dfedee
Merge branch 'jaybe-jekyll-patch-1'
...
* jaybe-jekyll-patch-1:
Reformat note in pagination docs to use proper HTML. Ref #3467
Clarify pagination file index.html may reside in subdirectory
Update pagination.md - Clarify only index.html
Clarify pagination works from within HTML files
2015-04-13 12:16:47 -04:00
c916f08aa3
Reformat note in pagination docs to use proper HTML. Ref #3467
2015-04-13 12:15:55 -04:00
059c7c6adf
Loosen redcarpet versioning dependency. Ref #3652
2015-04-13 12:09:43 -04:00
7126792d85
Update history to reflect merge of #3652 [ci skip]
2015-04-13 12:06:58 -04:00
f645cd3377
Merge pull request #3652 from christianv/security-fix-redcarpet
...
Merge pull request 3652
2015-04-13 12:05:51 -04:00
b718d4ea46
Merge pull request #3650 from chrisfinazzo/collections-docs
...
Merge pull request 3650
2015-04-13 12:05:05 -04:00
ec90210ed4
Security fix: OSVDB-120415 - Upgrade redcarpet to 3.2
...
*Note*: Please release a new gem version of jekyll after merging this.
More information at:
http://osvdb.org/show/osvdb/120415
`redcarpet Gem for Ruby contains a flaw that allows a cross-site scripting (XSS) attack. This flaw exists because the parse_inline() function in markdown.c does not validate input before returning it to users. This may allow a remote attacker to create a specially crafted request that would execute arbitrary script code in a user's browser session within the trust relationship between their browser and the server.`
9fc00d08148e707ebb94http://social.schiessle.org/display/b38b1460c2b201329b1f4860008dbc6c
https://gemnasium.com/gems/redcarpet/versions/3.2.3
/cc @parkr @envygeeks
2015-04-13 08:01:16 -07:00
9e86650df2
Remove extra word
2015-04-11 23:38:45 -04:00
53ca3446eb
Formatting
2015-04-11 18:53:19 -04:00
c76c4e478b
Convertible#read_yaml should return self.data.
...
Broken in 4b108df3ab
2015-04-11 15:42:58 -04:00
25af3e785f
Cleanup extra space and formatting
2015-04-10 18:14:09 -04:00
0374ad2668
Update history to reflect merge of #3468 [ci skip]
2015-04-10 17:29:39 -04:00
66a9e6909b
Merge branch 'davidsilvasmith-origin/patch-3'
...
* davidsilvasmith-origin/patch-3:
docs: remove extraneous period from datafiles example.
updated lsi docs
changed the codefile name
forgot a tick around a codefile name
proofed changes
removed personal link
How to access a specific item in the data folder
2015-04-10 17:23:43 -04:00
2f75ade1b7
docs: remove extraneous period from datafiles example.
2015-04-10 17:23:34 -04:00
1b5977c018
Update history to reflect the fixing of #3643 .
2015-04-10 17:08:53 -04:00
4b108df3ab
convertible: abort with an error if Page/Post#data isn't a hash.
...
when the default_proc was being assigned, it failed if it wasn't a Hash. We
expect data to be a Hash everywhere, so let's freak out if it isn't after
reading and applying the fallback.
Fixes #3643 .
2015-04-10 17:07:14 -04:00
279fb6af11
Update history to reflect merge of #3607 [ci skip]
2015-04-10 16:58:32 -04:00
2c316188fe
Merge branch 'chrisfinazzo-upgrading-docs'
...
* chrisfinazzo-upgrading-docs:
Add further fixes to upgrade doc. #3607
Use the new commands
Fix a typo, wrap lines
Remove reference to the watch command
Start working on an upgrade guide for Jekyll 3
2015-04-10 16:57:00 -04:00
20d48fcfe9
Add further fixes to upgrade doc. #3607
2015-04-10 16:56:55 -04:00
70a3156385
Update history to reflect merge of #3608 [ci skip]
2015-04-10 16:52:50 -04:00
bf98004843
Merge pull request #3608 from nickburlett/patch/incremental-build
...
Merge pull request 3608
2015-04-10 16:51:56 -04:00
436c98ad9b
Update history to reflect merge of #3623 [ci skip]
2015-04-10 16:33:03 -04:00
12b16dde52
Merge pull request #3623 from chrisfinazzo/ci-docs
...
Merge pull request 3623
2015-04-10 16:32:28 -04:00
9f55b1ff66
Update history to reflect merge of #3632 [ci skip]
2015-04-10 16:32:07 -04:00
eeb13872e3
Merge branch 'delftswa2014-remove-unused-method'
...
* delftswa2014-remove-unused-method:
static_file: extract extname in initializer and save as variable. #3632
removed unused method StaticFile::extname
2015-04-10 16:31:26 -04:00
f14af82da5
static_file: extract extname in initializer and save as variable. #3632
2015-04-10 16:31:19 -04:00
b6ea045e1b
Update history to reflect merge of #3647 [ci skip]
2015-04-10 16:28:28 -04:00
6d6c15eba2
Merge pull request #3647 from nhoizey/patch-1
...
Merge pull request 3647
2015-04-10 16:28:03 -04:00
a91775fcfe
Update history to reflect merge of #3633 [ci skip]
2015-04-10 16:25:34 -04:00
2c373e6fe9
Merge branch 'delftswa2014-static-file-test'
...
* delftswa2014-static-file-test:
DRY up the StaticFile tests a bit. #3633 .
Added tests for Jekyll:StaticFile
2015-04-10 16:24:51 -04:00
f86727c45a
DRY up the StaticFile tests a bit. #3633 .
2015-04-10 16:24:45 -04:00
76416e50e8
Add WOFF2 font format
2015-04-10 00:13:02 +02:00
90793b12e7
Update history to reflect merge of #3638 [ci skip]
2015-04-08 10:24:33 -07:00
9c02353b3c
Merge pull request #3638 from adunning/patch-1
...
Merge pull request 3638
2015-04-08 10:24:15 -07:00
329ed07405
Merge pull request #3637 from Sourdoughh/patch-1
...
Removed inconsistency with period
2015-04-04 18:05:29 -07:00
305a22a5bf
Explain how to access collection variables.
...
This example also demonstrates the use of nested variables.
2015-04-04 18:40:03 -04:00
a9dbb0de57
Removed inconsistency with period
2015-04-04 14:08:28 -07:00
28a1d2445e
Added tests for Jekyll:StaticFile
2015-04-01 17:15:44 +02:00
f0cac685de
removed unused method StaticFile::extname
2015-04-01 12:57:49 +02:00
0e52b83b6f
Update history.md to reflect the merger of #3628 .
2015-03-30 11:12:55 -05:00
1ac7f5cb15
Merge pull request #3628 from delftswa2014/profiling
...
Bring back minitest-profile
2015-03-30 11:11:59 -05:00
397492fa38
added the --profile flag to make use of the minitest-profile tool
2015-03-30 17:53:40 +02:00
b2aa8b6e68
Update history.md to reflect the merger of #3614 .
2015-03-28 19:27:26 -05:00
f75346c799
Merge pull request #3614 from nickburlett/patch/incremental-build-dest-missing
...
Incremental build if destination file missing
2015-03-28 19:26:01 -05:00
ec7474f55c
Only use 3 sections
2015-03-27 16:50:28 -04:00
Jordon Bedwell
Parker Moore
Arthur Neves
Christian Vuerings
chrisfinazzo
Nicolas Hoizey
Andrew Dunning
Jason Ly
Martijn den Hoedt