Merge remote-tracking branch 'origin/develop'

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

4 files changed, 0 insertions, 27 deletions

diff --git a/users/app/helpers/.gitkeep b/users/app/helpers/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/users/app/helpers/.gitkeep
+++ /dev/null
diff --git a/users/app/helpers/email_aliases_helper.rb b/users/app/helpers/email_aliases_helper.rb
deleted file mode 100644
index b56b068..0000000
--- a/users/app/helpers/email_aliases_helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module EmailAliasesHelper
-
-  def email_alias_form(options = {})
-    simple_form_for [@user, EmailAlias.new()],
-      :html => {:class => "form-horizontal email-alias form"},
-      :validate => true do |f|
-      yield f
-    end
-  end
-
-end
diff --git a/users/app/helpers/sessions_helper.rb b/users/app/helpers/sessions_helper.rb
deleted file mode 100644
index 309f8b2..0000000
--- a/users/app/helpers/sessions_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module SessionsHelper
-end
diff --git a/users/app/helpers/users_helper.rb b/users/app/helpers/users_helper.rb
deleted file mode 100644
index f56faab..0000000
--- a/users/app/helpers/users_helper.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module UsersHelper
-
-  def user_form_class(*classes)
-    (classes + ['user', 'form', (@user.new_record? ? 'new' : 'edit')]).compact.join(' ')
-  end
-
-  def wrapped(item, options = {})
-    options[:as] ||= :div
-    content_tag options[:as], :class => dom_class(item), :id => dom_id(item) do
-      yield
-    end
-  end
-
-end