dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update activesupport handling and add comment to Gemfile. 

/cc #5100
This commit is contained in:
Parker Moore 2016-07-12 20:17:44 -07:00
parent cc994105ed
commit a3cd584311
No known key found for this signature in database
GPG Key ID: 193CDEBA72063C58
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -3,7 +3,8 @@ gemspec :name => "jekyll"
gem "rake", "~> 11.0" gem "rake", "~> 11.0"
gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_ENGINE == 'ruby' && RUBY_VERSION < '2.2.2' # Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < '2.2.2'
group :development do group :development do
gem "launchy", "~> 2.3" gem "launchy", "~> 2.3"

2
site/_docs/contributing.md
View File

@ -73,7 +73,7 @@ One gotcha, all pull requests should be directed at the `master` branch (the def
### Adding plugins ### Adding plugins
If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](https://jekyllrb.com/docs/plugins/) by adding a link to your plugin under the proper subheading depending upon its type. If you want to add your plugin to the [list of plugins](https://jekyllrb.com/docs/plugins/#available-plugins), please submit a pull request modifying the [plugins page source file](site/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type.
## Code Contributions ## Code Contributions