Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

1 files changed, 0 insertions, 25 deletions

diff --git a/core/lib/tasks/leap_web_core_tasks.rake b/core/lib/tasks/leap_web_core_tasks.rake
deleted file mode 100644
index ec6abac..0000000
--- a/core/lib/tasks/leap_web_core_tasks.rake
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace :couchrest do
-
-  desc "Dump all the design docs found in each model"
-  task :dump => :environment do
-    CouchRest::Model::Utils::Migrate.load_all_models
-    CouchRest::Model::Utils::Migrate.dump_all_models
-  end
-end
-
-namespace :cleanup do
-  
-  desc "Cleanup all expired session documents"
-  task :sessions => :environment do
-    # make sure this is the same as in
-    #   config/initializers/session_store.rb
-    store = CouchRest::Session::Store.new expire_after: 1800
-    store.cleanup(store.expired)
-  end
-
-  desc "Cleanup all expired tokens"
-  task :tokens => :environment do
-    Token.destroy_all_expired
-  end
-end
-