Commit Graph

75 Commits

Author SHA1 Message Date
Parker Moore
3b021c6046 Move Rubocop gem to :test group in Gemfile 2016-05-12 14:33:48 -05: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
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
Jordon Bedwell
f80321ecac Update Rake.
Update Rake and disable verbosity when running the specs because we have some
deprecated usage (for now -- however, see: jekyll/jekyll#4719) and because
Rouge, and Liquid throw out thousands (probably hyperbolic) of warnigns when the
specs are being ran.  We need upstream to fix their problems while we fix ours
or we'll all have a bad day, not that we aren't already.
2016-03-27 22:22:35 -05:00
Parker Moore
a30068bf3f Merge remote-tracking branch 'origin/master' into themes
* origin/master: (65 commits)
  Update history to reflect merge of #4703 [ci skip]
  Update history to reflect merge of #4712 [ci skip]
  Highlight the test code
  Update history to reflect merge of #4640 [ci skip]
  readded "env=prod"-condition
  Update history to reflect merge of #3849 [ci skip]
  Update history to reflect merge of #4624 [ci skip]
  Update history to reflect merge of #4704 [ci skip]
  Update history to reflect merge of #4706 [ci skip]
  Checks for link file extension in tests
  Updating assets documentation
  Fix test teardown for cleaner.
  Update history to reflect merge of #4542 [ci skip]
  Add explanation of site variables in the example _config.yml
  Use double quotes in the gemfile
  Add test for creation of Gemfile by 'jekyll new'
  Add comment about github-pages
  Update history to reflect merge of #4533 [ci skip]
  Ensure Rouge closes its div/figure properly after highlighting ends.
  Add Site#config= which can be used to set the config
  ...
2016-03-25 16:30:25 -07:00
Parker Moore
ac9a72482d Lock jemoji to v0.5.1 while we figure out the issue with HTML::Pipeline.
Reference issue: https://github.com/jekyll/jemoji/pull/37
2016-03-16 15:28:06 -07:00
Ben Balter
8b880cb993 add theme tests 2016-03-05 13:35:52 -05:00
Parker Moore
de8f67c4a2 Fix link issues in the site found by HTML Proofer. 2016-03-01 19:43:22 -08:00
Jordon Bedwell
e3cfe13ef5 Spacing. 2016-02-27 09:56:06 -06:00
Jordon Bedwell
0e155adef6 Hash Rocket. 2016-02-27 09:55:14 -06:00
Ben Balter
9e67c0a9b7 require jekyll-seo-tag > 1.1 2016-02-20 14:06:52 -05:00
Ben Balter
7bffb39244 add jekyll-seo-tag, jekyll-avatar, jekyll-sitemap 2016-02-20 12:54:28 -05:00
Parker Moore
d1c08d85d2 Look for local docs if the dir exists. 2016-02-19 17:18:08 -08:00
Parker Moore
8d7e329a6e Get jekyll-docs working. 2016-02-19 16:54:24 -08:00
Florian Thomas
8d8021e0ac require at least cucumber version 2.1.0 2016-02-13 00:06:03 +01:00
Parker Moore
2e5e6ace3d Fix emoji support on the site.
Seems to work for us, despite https://github.com/jekyll/jemoji/issues/32 ?
2016-02-08 10:59:24 -08:00
Jordon Bedwell
ec0eff3315 Switch to pry-byebug so everybody gets the benefit. 2016-01-20 13:30:56 -06:00
Jordon Bedwell
e50d4d6b6e Fix bad UNLESS. 2016-01-20 07:30:07 -06:00
Jordon Bedwell
61acafe97a Move ByeBug to development and disallow for JRuby. 2016-01-20 07:24:24 -06:00
Parker Moore
207fcbdef7 Add byebug for debugging purposes. 2016-01-15 11:23:09 -08:00
Jordon Bedwell
5555db8c72 Start using Rubocop from Github, it supports our config. 2016-01-12 06:59:09 -06:00
Jordon Bedwell
712c16a7f1 Try to cleanup the Gemfile... again.
The problem last time was that we removed Pry and Pry brings in CodeRay, we were
testing legacy stuff and didn't have CodeRay in our dependencies, which resulted
in those tests failing.

This also quietly announces the intention to move to RSpec by moving the old
test dependencies to ":test_legacy" and is slightly less agressive in it's
organization than before.
2016-01-12 06:54:45 -06:00
Jordon Bedwell
1583b26627 Update jekyll-feed. 2016-01-11 16:45:50 -06:00
Jordon Bedwell
3c9f159fb8 Move Cucumber to using RSpec-Expections and furthering JRuby support.
* Removes posix-spawn in favor of Open3#popen3
* Encapsulates all the paths into a single easy class.
* Moves to %r{} to avoid ambiguious warnings per-Cucumber suggestion.
* Starts passing around Pathname to make some actions faster.
* Clean's up some methods to make them easier to read.
* AUTOMATIC: Add "#" between each method.
2016-01-10 14:41:48 -06:00
Jordon Bedwell
55423e344e Add CodeClimate to the testing stuff. 2016-01-10 11:18:46 -06:00
Jordon Bedwell
9d98aca86a Revert "Reorganize and cleanup the Gemfile, shorten required depends." 2016-01-10 00:27:58 -06:00
Jordon Bedwell
a48c02a889 Reorganize and cleanup the Gemfile, shorten depends on Travis. 2016-01-05 12:36:40 -06:00
Parker Moore
8e68de2740 site: redirect /docs/ to /docs/home/ 2016-01-04 18:22:55 -08:00
Jordon Bedwell
b7d5a26d53 Move around CodeClimate so people can do bundle exec rubocop.
/cc @pathawks -- This is why you were not getting the custom settings we had
made and some things were showing up as broken when they weren't.  Sorry.
2016-01-03 02:21:21 -06:00
Parker Moore
6cbd06ea85 Merge pull request #4109 from jekyll/cleanup-kramdown-converter
Merge pull request 4109
2015-12-04 09:21:22 -08:00
Parker Moore
fe13c3b366 KramdownConverter: clean up some source with some unified methods 2015-12-04 09:21:11 -08:00
Jordon Bedwell
3432fd2c2d Modernize Kramdown for Markdown converter. 2015-12-04 08:09:08 -06:00
Parker Moore
8a09418083 Allow use of Cucumber 2.1 or greater 2015-11-24 16:28:02 -08:00
Jordon Bedwell
256212649a Update mime-types. 2015-11-24 04:26:05 -06:00
Parker Moore
2b4a3c008d Release 💎 3.0.1 2015-11-17 22:19:45 -08:00
Jordon Bedwell
9b091f8d5d Update Kramdown and reduce it's constraints. 2015-10-09 07:28:02 -05:00
Jordon Bedwell
d6b37a1644 Lock Cucumber to 2.0 because 2.1 is broken. 2015-09-11 15:03:07 -05:00
Ben Balter
47df90583a Merge branch 'master' into jekyll-feed 2015-09-01 14:35:55 -04:00
Jordon Bedwell
5af105ca71 Try to organize dependencies into dev and test groups. 2015-07-16 16:31:30 -05:00
Jordon Bedwell
dba6df907f Update Kramdown. 2015-07-16 08:36:44 -05:00
Jordon Bedwell
9c4bf19c71 Update dependencies. 2015-06-17 10:31:44 -05:00
Ben Balter
82bb18176f use jekyll-feed 2015-05-25 16:09:16 -04:00
Jordon Bedwell
f054bae503 Add support for JRuby, it was easier than assumed. 2015-05-15 07:10:22 -05:00
Florian Weingarten
56c38f87b2 Add script/rubyprof to generate cachegrind callgraphs 2015-05-10 04:18:04 +00:00
Jordon Bedwell
a682ca1600 Merge pull request #3658 from jekyll/fix-jekyll-minitest-rspec-mocks
Create #mock_expects that goes directly to RSpec Mocks.
2015-04-14 15:15:02 -05:00
Jordon Bedwell
f26cdd8da4 Create #mock_expects that goes directly to RSpec Mocks. 2015-04-14 14:20:55 -05:00
Alfred Xing
ae039663b9 Remove Maruku and references to it 2015-04-14 10:58:47 -07:00
Arthur Neves
62cfd45d79 Force minitest version
[related #3656]
2015-04-14 12:22:13 -04:00
Parker Moore
059c7c6adf Loosen redcarpet versioning dependency. Ref #3652 2015-04-13 12:09:43 -04:00
Christian Vuerings
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.`

9fc00d0814
8e707ebb94
http://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