diff --git a/.gitignore b/.gitignore index 570fbd87bd..ebf06998b1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ coverage.xml cover/ log/ reports/ -\#*\# \ No newline at end of file +/src/ +\#*\# diff --git a/Gemfile b/Gemfile index b0065474bc..c6a19caca2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source :rubygems -gem 'rake', '0.8.3' +gem 'rake' gem 'sass', '3.1.15' gem 'bourbon', '~> 1.3.6' diff --git a/Gemfile.lock b/Gemfile.lock index d6ec0096e2..2a9d48c35c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: bourbon (1.3.6) sass (>= 3.1) - rake (0.8.3) + rake (0.9.2.2) sass (3.1.15) PLATFORMS @@ -11,5 +11,5 @@ PLATFORMS DEPENDENCIES bourbon (~> 1.3.6) - rake (= 0.8.3) + rake sass (= 3.1.15) diff --git a/requirements.txt b/requirements.txt index 4135b6aab4..c05b9eb265 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ python-memcached django-celery path.py django_debug_toolbar -django-pipeline +-e git://github.com/MITx/django-pipeline.git@incremental_compile#egg=django-pipeline django-staticfiles>=1.2.1 django-masquerade fs