aboutsummaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorAlexandre Perrin <alexandre.perrin@netoxygen.ch>2013-09-27 10:53:43 +0200
committerAlexandre Perrin <alexandre.perrin@netoxygen.ch>2013-09-27 10:53:43 +0200
commit8bfd5ef3237f07125adde7043c19a3159879044a (patch)
tree6ac9b05d53cde0c5a6c837e8316683f652f3d5cf /Gemfile
parentfe28c0b518e47f7929772eaaab7b0118ddcfbaad (diff)
parentf0674c69366b9172e6811036bbc5b0a29dbf6025 (diff)
downloadmy_new_personal_website-8bfd5ef3237f07125adde7043c19a3159879044a.tar.xz
my_new_personal_website-8bfd5ef3237f07125adde7043c19a3159879044a.zip
Merge branch 'master' of https://github.com/imathis/octopress
Diffstat (limited to '')
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock10
2 files changed, 9 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index cabfa563..cd8ce578 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
group :development do
gem 'rake', '~> 0.9'
@@ -8,11 +8,13 @@ group :development do
gem 'RedCloth', '~> 4.2.9'
gem 'haml', '~> 3.1.7'
gem 'compass', '~> 0.12.2'
+ gem 'sass', '~> 3.2'
gem 'sass-globbing', '~> 1.0.0'
gem 'rubypants', '~> 0.2.0'
gem 'rb-fsevent', '~> 0.9'
gem 'stringex', '~> 1.4.0'
gem 'liquid', '~> 2.3.0'
+ gem 'directory_watcher', '1.4.1'
end
gem 'sinatra', '~> 1.4.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 82c5dcf9..182c30bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,5 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
chunky_png (1.2.5)
@@ -33,9 +33,9 @@ GEM
rack
rake (0.9.2.2)
rb-fsevent (0.9.1)
- rdiscount (1.6.8)
+ rdiscount (2.0.7.3)
rubypants (0.2.0)
- sass (3.1.20)
+ sass (3.2.9)
sass-globbing (1.0.0)
sass (>= 3.1)
sinatra (1.4.2)
@@ -53,14 +53,16 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.2.9)
compass (~> 0.12.2)
+ directory_watcher (= 1.4.1)
haml (~> 3.1.7)
jekyll (~> 0.12)
liquid (~> 2.3.0)
pygments.rb (~> 0.3.4)
rake (~> 0.9)
rb-fsevent (~> 0.9)
- rdiscount (~> 1.6.8)
+ rdiscount (~> 2.0.7)
rubypants (~> 0.2.0)
+ sass (~> 3.2)
sass-globbing (~> 1.0.0)
sinatra (~> 1.4.2)
stringex (~> 1.4.0)