diff --git a/Gemfile b/Gemfile index d8edaa5..aa8e789 100644 --- a/Gemfile +++ b/Gemfile @@ -5,11 +5,8 @@ gem 'rake' gem 'jekyll' gem 'jekyll-assets' -gem 'octopress', git: 'git@github.com:octopress/octopress.git', branch: 'master' +gem 'octopress', '~> 3.0.0.rc.8' gem 'octopress-deploy', '~> 1.0.0.rc.6' -# octopress-deploy requires pry-debugger but does not specify it -# as a runtime dependency. -gem 'pry-debugger' gem 'kramdown', '~> 1.3.3' diff --git a/Gemfile.lock b/Gemfile.lock index 21270c1..21fa54f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -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 remote: https://rubygems.org/ specs: @@ -16,17 +7,9 @@ GEM thor classifier (1.3.4) fast-stemmer (>= 1.0.0) - coderay (1.1.0) colorator (0.1) - columnize (0.8.9) commander (4.1.6) highline (~> 1.6.11) - debugger (1.6.6) - columnize (>= 0.3.1) - debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.3.2) - debugger-linecache (1.2.0) - debugger-ruby_core_source (1.3.2) execjs (2.0.2) facets (2.9.3) fast-stemmer (1.0.2) @@ -56,21 +39,16 @@ GEM rb-kqueue (>= 0.2) maruku (0.7.0) mercenary (0.3.2) - method_source (0.8.2) multi_json (1.9.3) - octopress-deploy (1.0.0.rc.6) + octopress (3.0.0.rc.8) + jekyll (~> 1.5, >= 1.5.0) + mercenary (~> 0.3.2) + octopress-deploy (1.0.0.rc.7) colorator octopress (~> 3.0.0.rc.1) parslet (1.5.0) blankslate (~> 2.0) posix-spawn (0.3.8) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - pry-debugger (0.2.2) - debugger (~> 1.3) - pry (~> 0.9.10) pygments.rb (0.5.4) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) @@ -83,8 +61,7 @@ GEM ffi (>= 0.5.0) redcarpet (2.3.0) safe_yaml (1.0.3) - sass (3.3.6) - slop (3.5.0) + sass (3.3.7) sprockets (2.12.1) hike (~> 1.2) multi_json (~> 1.0) @@ -108,9 +85,8 @@ DEPENDENCIES jekyll jekyll-assets kramdown (~> 1.3.3) - octopress! + octopress (~> 3.0.0.rc.8) octopress-deploy (~> 1.0.0.rc.6) - pry-debugger rake sass uglifier