Skip to content
Permalink
Browse files

Merge branch 'master' of git://github.com/imathis/octopress into source

  • Loading branch information...
VincentTam committed May 31, 2014
2 parents 8f72ef7 + 9bc4bb0 commit 27d05105f4a82c8512ad6c8233fe7a70dc373e60
Showing with 4 additions and 4 deletions.
  1. +3 −3 Rakefile
  2. +1 −1 plugins/gist_tag.rb
@@ -187,8 +187,8 @@ task :update_style, :theme do |t, args|
end
mv "sass", "sass.old"
puts "## Moved styles into sass.old/"
cp_r "#{themes_dir}/"+theme+"/sass/", "sass"
cp_r "sass/custom/.", "sass.old/custom"
cp_r "#{themes_dir}/"+theme+"/sass/", "sass", :remove_destination=>true
cp_r "sass.old/custom/.", "sass/custom/", :remove_destination=>true
puts "## Updated Sass ##"
end

@@ -261,8 +261,8 @@ multitask :push do
cp_r "#{public_dir}/.", deploy_dir
cd "#{deploy_dir}" do
system "git add -A"
puts "\n## Committing: Site updated at #{Time.now.utc}"
message = "Site updated at #{Time.now.utc}"
puts "\n## Committing: #{message}"
system "git commit -m \"#{message}\""
puts "\n## Pushing generated #{deploy_dir} website"
system "git push origin #{deploy_branch}"
@@ -50,7 +50,7 @@ def script_url_for(gist_id, filename)
end

def get_gist_url_for(gist, file)
"https://gist.github.com/raw/#{gist}/#{file}"
"https://gist.githubusercontent.com/raw/#{gist}/#{file}"
end

def cache(gist, file, data)

0 comments on commit 27d0510

Please sign in to comment.
You can’t perform that action at this time.