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

7146 Commits

Author SHA1 Message Date
jekyllbot 53d6b91fc8 Update history to reflect merge of #4857 [ci skip] 2016-04-29 12:22:47 -07:00
jekyllbot 6c081427c4 Merge pull request #4857 from jekyll/fix/dont-rescue-load-error-for-bundler 
Merge pull request 4857
 2016-04-29 12:22:46 -07:00
Jordon Bedwell 44cf61d241
Fix #4856: Don't rescue LoadError or bundler load errors for Bundler. 
When it comes to bundler it's smart enough to know what to require, and in casees it's not, it's smart enough to accept :require.  In most cases when bundler has a LoadError (or otherwise) it's because there is a problem inside of the Gem itself and when this happens, Jekyll will happily let that error slip when it shouldn't, resulting in a badly placed error that is actually wrong. This corrects that so errors can surface properly.
 2016-04-29 06:37:57 -05:00
jekyllbot b8e7669228 Update history to reflect merge of #4855 [ci skip] 2016-04-28 19:07:17 -07:00
jekyllbot 51c0c934d3 Merge pull request #4855 from jekyll/upgrade/update-colorator-to-1.0 
Merge pull request 4855
 2016-04-28 19:07:16 -07:00
Jordon Bedwell 46f54e6b94
Update Colorator to 1.0 2016-04-28 20:58:05 -05:00
jekyllbot 0ee1a75d16 Update history to reflect merge of #4854 [ci skip] 2016-04-28 18:27:57 -07:00
jekyllbot c9d5c7d30a Merge pull request #4854 from jekyll/site-improvements 
Merge pull request 4854
 2016-04-28 18:27:56 -07:00
Parker Moore 342d5a4250
site: optimize liquid for whitespace removal 2016-04-28 18:26:44 -07:00
Parker Moore 19b566e6ea
site: use rouge instead of pygments 2016-04-28 18:26:29 -07:00
Parker Moore d74f8d6dd9
Fix spacing on the msg in Configuration#renamed_key 2016-04-28 17:55:15 -07:00
Parker Moore 6ed193277d Merge pull request #4847 from jekyll/3-0-5-release-post 
Add release notes for v3.0.5
 2016-04-26 18:01:01 -07:00
Parker Moore 960342eb38
Add link to history doc. 2016-04-26 18:00:33 -07:00
Parker Moore 008e694732
Compile history. 2016-04-26 17:59:05 -07:00
Parker Moore 4d264b5b9c
Add release notes for v3.0.5 2016-04-26 17:57:07 -07:00
Jordon Bedwell b45f575ffe Move to the Rubocop Gem, they've 2.3+ support and TargetVersion deployed now. 
Previously we relied on the Git version of Rubocop so that we could get 2.3+ and TargetVersion support in our .rubocop.yml, they have since updated stable and made this available to the general public.
 2016-04-26 19:19:53 -05:00
jekyllbot f535497d90 Update history to reflect merge of #4844 [ci skip] 2016-04-26 17:13:18 -07:00
jekyllbot 70fb98f777 Merge pull request #4844 from ahanselka/formkeep 
Merge pull request 4844
 2016-04-26 17:13:18 -07:00
Alex Hanselka 514fdc7610 update formkeep url 2016-04-26 16:23:52 -05:00
Parker Moore 605cd265c0 Disable IRC build notifications. 2016-04-25 15:08:06 -07:00
jekyllbot 6d0bab5d59 Update history to reflect merge of #4710 [ci skip] 2016-04-21 17:38:01 -07:00
jekyllbot 1d788203df Merge pull request #4710 from fenollp/safe-symlinks 
Merge pull request 4710
 2016-04-21 17:38:00 -07:00
jekyllbot 1ac9c21956 Update history to reflect merge of #4808 [ci skip] 2016-04-21 17:20:03 -07:00
jekyllbot 298d56aab2 Merge pull request #4808 from jekyll/fix-collection-defaults- 
Merge pull request 4808
 2016-04-21 17:20:02 -07:00
jekyllbot d8dc0b6333 Update history to reflect merge of #4595 [ci skip] 2016-04-21 17:19:00 -07:00
jekyllbot 30f2bdff5b Merge pull request #4595 from jekyll/themes 
Merge pull request 4595
 2016-04-21 17:18:59 -07:00
Parker Moore 685abf109b Merge pull request #4819 from jekyll/release-posts 
Release posts for v3.0.4 and v3.1.3
 2016-04-21 17:17:31 -07:00
Parker Moore e4057e0c81
Write release posts. 2016-04-21 17:17:13 -07:00
Parker Moore 57ccbe08ea
Ensure symlinks work as expected (and secured). 2016-04-21 16:32:52 -07:00
Parker Moore bac65ea8c5
C'mon travis 2016-04-21 16:16:46 -07:00
Parker Moore 49a3f543f3
Theme: configure sass at initialize time so we don't forget 2016-04-21 16:11:09 -07:00
Parker Moore 3b2d68d333
LayoutReader: read proper item from theme class 2016-04-21 16:10:43 -07:00
Parker Moore 2b73696d03
Set @path and @base_dir on the Layout per whether it's in the theme 2016-04-21 16:10:19 -07:00
Parker Moore d5dd423bfd
Add cucumber specs. 2016-04-21 16:09:23 -07:00
Parker Moore 42cc2445a5
Merge branch 'master' into themes 
* master: (58 commits)
  Update history to reflect merge of #4792 [ci skip]
  Update history to reflect merge of #4793 [ci skip]
  Update history to reflect merge of #4804 [ci skip]
  Update history to reflect merge of #4754 [ci skip]
  Update history to reflect merge of #4813 [ci skip]
  Added missing single quote on rsync client side command
  Add v3.0.4 and v3.1.3 to the history.
  Fixed typo
  Add jekyll-autoprefixer plugin
  Explicitly require Filters rather than implicitly.
  Update history to reflect merge of #4786 [ci skip]
  Update history to reflect merge of #4789 [ci skip]
  updates example domain in config template
  Globalize Jekyll's Filters.
  Update JRuby to 9.0.5.0; Drop the double digit test.
  Update Rack-Jekyll Heroku deployment blog post url
  convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files
  Update history to reflect merge of #4734 [ci skip]
  Update history to reflect merge of #4478 [ci skip]
  Fix rubocop warning.
  ...
 2016-04-21 11:43:35 -07:00
Parker Moore f67f771a45
Empty release posts 2016-04-21 11:41:54 -07:00
Parker Moore 655ffd45be Use source_dir instead of my own computer's path 2016-04-21 11:26:33 -07:00
jekyllbot 0d89b77dae Update history to reflect merge of #4792 [ci skip] 2016-04-20 14:06:11 -07:00
jekyllbot 341407ef2a Merge pull request #4792 from jekyll/feature/globalize-filters 
Merge pull request 4792
 2016-04-20 14:06:10 -07:00
jekyllbot 1d55558956 Update history to reflect merge of #4793 [ci skip] 2016-04-20 14:03:36 -07:00
jekyllbot 46b2ab8e88 Merge pull request #4793 from sl4m/change-example-domain-url 
Merge pull request 4793
 2016-04-20 14:03:36 -07:00
jekyllbot 823a84fec9 Merge pull request #4799 from vwochnik/patch-1 
Merge pull request 4799
 2016-04-20 14:01:22 -07:00
jekyllbot 1ec64f568d Update history to reflect merge of #4804 [ci skip] 2016-04-20 13:57:26 -07:00
jekyllbot f6f0d39b81 Merge pull request #4804 from henrywright/patch-1 
Merge pull request 4804
 2016-04-20 13:57:25 -07:00
jekyllbot 94647af1f4 Update history to reflect merge of #4754 [ci skip] 2016-04-20 12:31:10 -07:00
jekyllbot 894b356619 Merge pull request #4754 from lexoyo/patch-1 
Merge pull request 4754
 2016-04-20 12:31:08 -07:00
jekyllbot f61ba8abf7 Update history to reflect merge of #4813 [ci skip] 2016-04-19 11:02:18 -07:00
jekyllbot ccd5c9e106 Merge pull request #4813 from joshaidan/patch-1 
Merge pull request 4813
 2016-04-19 11:02:17 -07:00
Brian Jones 4e09375531 Added missing single quote on rsync client side command 
The rsync command was missing a single quote around the --rsh='ssh -p2222' parameter.
 2016-04-19 13:59:23 -04:00
Parker Moore 9315cdb473
Add v3.0.4 and v3.1.3 to the history. 2016-04-18 14:34:29 -07:00