danbarber/danbarber.me
1
0
Fork 0
mirror of https://github.com/danbee/danbarber.me synced 2025-03-04 08:59:10 +00:00
Code Issues Releases Wiki Activity

Update Octopress to master branch.

Browse Source
This commit is contained in:
Dan Barber 2014-05-01 19:40:54 +01:00
parent 197e71282f
commit 5f78d68c13
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -5,7 +5,7 @@ gem 'rake'
gem 'jekyll' gem 'jekyll'
gem 'jekyll-assets' gem 'jekyll-assets'
gem 'octopress', '~> 3.0.0.rc.7' gem 'octopress', git: 'git@github.com:octopress/octopress.git', branch: 'master'
gem 'octopress-deploy', '~> 1.0.0.rc.6' gem 'octopress-deploy', '~> 1.0.0.rc.6'
# octopress-deploy requires pry-debugger but does not specify it # octopress-deploy requires pry-debugger but does not specify it
# as a runtime dependency. # as a runtime dependency.

14
Gemfile.lock
View File

@ -1,3 +1,12 @@
GIT
remote: git@github.com:octopress/octopress.git
revision: 8e8c4cf168e959a504a38c4a0d0e898d5a63e811
branch: master
specs:
octopress (3.0.0.rc.7)
jekyll (~> 1.5, >= 1.5.0)
mercenary (~> 0.3.2)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -49,9 +58,6 @@ GEM
mercenary (0.3.2) mercenary (0.3.2)
method_source (0.8.2) method_source (0.8.2)
multi_json (1.9.3) multi_json (1.9.3)
octopress (3.0.0.rc.7)
jekyll (~> 1.5, >= 1.5.0)
mercenary (~> 0.3.2)
octopress-deploy (1.0.0.rc.6) octopress-deploy (1.0.0.rc.6)
colorator colorator
octopress (~> 3.0.0.rc.1) octopress (~> 3.0.0.rc.1)
@ -102,7 +108,7 @@ DEPENDENCIES
jekyll jekyll
jekyll-assets jekyll-assets
kramdown (~> 1.3.3) kramdown (~> 1.3.3)
octopress (~> 3.0.0.rc.7) octopress!
octopress-deploy (~> 1.0.0.rc.6) octopress-deploy (~> 1.0.0.rc.6)
pry-debugger pry-debugger
rake rake