github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-31 01:38:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,766 Commits 60 Branches 160 Tags
4085e29f80fbb760cd2050a9a8cc93bc18dbb6ee
Commit Graph

380 Commits

Author SHA1 Message Date
Ashwin Maroli
eb36ea095f test overriding default excludes 2017-02-05 01:56:49 +05:30
jekyllbot
477b2f0f3e Merge pull request #5640 from jekyll/jekyll-utils-exec 
Merge pull request 5640
 2017-01-18 14:15:11 -05:00
Florian Thomas
ecd04badf0 throw IncludeTagError if error occurs in included file 
fixes #5756
 2017-01-15 20:35:10 +01:00
Pat Hawks
1d885911bc Rubocop: Require consistent comma in multiline literals 2017-01-12 17:52:29 -06:00
Pat Hawks
203be72c47 Remove unnecessary "rubocop:enable" 2017-01-06 05:57:21 -06:00
Pat Hawks
0f2013114c Merge branch 'master' into jekyll-utils-exec 2017-01-06 05:42:15 -06:00
Parker Moore
18c2b0827e Appease rubocop. 2016-12-07 17:53:45 -08:00
Parker Moore
6e2449b482 Write Jekyll::Utils::Exec.run for running shell commands. 2016-12-07 17:38:22 -08:00
Ashwin Maroli
c6fe7ec57f add a set of steps in site_configuration.feature 
this set of steps allow the test to pass when DST in not currently active.
They may fail when DST becomes active.
 2016-12-06 22:19:07 +05:30
Ashwin Maroli
1b4ab418ba revert and adjust site_configuration.feature 2016-12-06 15:38:18 +05:30
jekyllbot
805dd4b0f1 Merge pull request #5611 from XhmikosR/https 
Merge pull request 5611
 2016-11-29 15:50:29 -08:00
XhmikosR
d9cf97e9c6 Switch to https when possible. 
Also, remove two 404 links.
 2016-11-29 23:39:23 +02:00
--global
6cbcaa99ad fix collection cucumber for windows 2016-11-29 14:17:56 +01:00
--global
d7cdab16e2 fix cucumber tests 2016-11-29 14:07:07 +01:00
jekyllbot
a2367900fc Merge pull request #5384 from ashmaroli/theme-gem-feature 
Merge pull request 5384
 2016-11-28 21:38:16 -08:00
Ashwin Maroli
7314e4a5db collections.feature: conditional steps 2016-11-04 12:29:48 +05:30
Ashwin Maroli
f636067661 remove 'css' subdirectory from assets folder 2016-09-30 15:34:46 +05:30
Ashwin Maroli
87a03f6c1a replace zero exit status steps 2016-09-30 15:23:08 +05:30
Ashwin Maroli
1fb4dce2f5 add a step to check contents in assets directory 2016-09-29 06:47:29 +05:30
Ashwin Maroli
1b4b51236a add theme-gem feature for bonafide theme gems 
this cucumber feature follows the likely steps a theme designer would take
to build a Rubygem of his theme starting from the scaffolding generated by
`jekyll new-theme` command and further checks if the gem built actually
has the files he planned to include.
 2016-09-29 06:36:24 +05:30
jekyllbot
6847b604c8 Merge pull request #5157 from stevecheckoway/fix-hooks-priority-order 
Merge pull request 5157
 2016-09-28 16:39:44 -07:00
Ashwin Maroli
6b6ce3cf18 use UTC format in timezone 2016-09-25 23:11:51 +05:30
Ashwin Maroli
588b3a6649 remove features dirs on windows with proper access 2016-09-21 22:42:01 +05:30
Parker Moore
279f1516d2 Merge branch 'master' into themes-asset-folder 
* master:
  Update history to reflect merge of #5381 [ci skip]
  Update history to reflect merge of #5383 [ci skip]
  run features on windows
  Appease Rubocop
  Update history to reflect merge of #5372 [ci skip]
  Add missing period to sentence in first paragraph.
 2016-09-20 13:13:01 -07:00
Ashwin Maroli
75d59911ae run features on windows 2016-09-20 10:28:54 +05:30
Parker Moore
74baeb889a ThemeAssetsReader: fix tests so everything passes. 2016-09-18 15:04:15 -04:00
Stephen Checkoway
6167c09569 Run hooks in priority order. 
Low priority hooks are being run before higher priority hooks. This is easy to
demonstrate with the following plugin:

    1.upto(10).each do |n|
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:low] do
        puts "Low #{n}"
      end
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:normal] do
        puts "Normal #{n}"
      end
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:high] do
        puts "High #{n}"
      end
    end

Sorting by the negative of the priority and then by the order the hook was
added does the right thing.
 2016-08-06 20:56:34 -05:00
Parker Moore
4b698747dc Style fixes for Rubocop 0.42.0 
- var == 0 becomes var.zero?
- when defining method_missing, also define respond_to_missing?
 2016-07-25 12:46:43 -07:00
Parker Moore
f417cf8a0f Merge pull request #5042 from jekyll/fix-more-theme-things 
Fix more theme things
 2016-07-14 17:14:41 -07:00
Parker Moore
83a72606b3 Add a test to ensure the Apache bug doesn't come up again. 2016-07-14 16:23:02 -07:00
Parker Moore
897f0c52fa Add test for CoC flag. 2016-06-29 15:17:04 -07:00
Parker Moore
6cf6da04af features: change jekyll bin path to use exe/jekyll 2016-06-15 12:12:44 -07:00
Nathan Hazout
d1f4d874be Added a scenario for #4414 2016-06-15 11:21:02 +03:00
jekyllbot
eba9a2716b Merge pull request #4908 from jekyll/add-timing-cucumber 
Merge pull request 4908
 2016-06-13 14:23:41 -07:00
Parker Moore
f5a0db9dcc Rubocop: use %r for all regular expressions. 2016-06-02 17:08:21 -07:00
Parker Moore
956495f450 Fix typo. 2016-06-02 16:47:14 -07:00
Parker Moore
4b1012537f Use #take instead of #take_while 2016-06-02 16:44:12 -07:00
Parker Moore
6355a07d4b Only do top 10 worst offenders in cucumberland 2016-06-02 16:43:47 -07:00
Parker Moore
14b36aae38 Add timings for each scenario in cucumber 2016-06-02 16:43:32 -07:00
Anatoliy Yastreb
22982ef79e rubocop: fix over tabbed variable assignment 2016-05-27 13:59:18 +03:00
Anatoliy Yastreb
d5d2fd8674 rubocop: fix code style 2016-05-27 13:34:45 +03:00
Pat Hawks
45a5a976f0 Rubocop: features/support/helpers.rb 2016-05-26 12:00:21 -05:00
Pat Hawks
ab3cda6e58 Rubocop: features/support/formatter.rb 2016-05-26 12:00:01 -05:00
Parker Moore
8e939cd86e Add failing test for layout data inheritance bug (#4433) 2016-05-24 18:57:54 -05:00
Parker Moore
a99adcafaa Add failing test for layout bug (#4897) 2016-05-24 18:57:53 -05:00
Parker Moore
12deccc513 Only spec.summary is needed... 2016-05-19 14:39:55 -07:00
Andrew Artajos
2d8a228b59 Fixed a typo 
Fixed a typo from indend to indent. Just making the code more readable.
 2016-05-05 09:14:03 +10:00
jekyllbot
298d56aab2 Merge pull request #4808 from jekyll/fix-collection-defaults- 
Merge pull request 4808
 2016-04-21 17:20:02 -07:00
Parker Moore
d5dd423bfd Add cucumber specs. 2016-04-21 16:09:23 -07:00
Florian Thomas
46dd5cf5a2 add failing test for scope values in subdirs 
ref #4458
 2016-04-18 13:55:51 -07:00