Merge branch 'master' into feature/limit_user_leak

Conflicts:
	users/lib/warden/strategies/secure_remote_password.rb

1 files changed, 2 insertions, 1 deletions

diff --git a/Gemfile b/Gemfile
index 4bf0f3b..56cbf62 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,8 @@ gem 'leap_web_help', :path => 'help'
 
 # To use debugger
 gem 'debugger', :platforms => :mri_19
-gem 'ruby-debug', :platforms => :mri_18
+# ruby 1.8 is not supported anymore
+# gem 'ruby-debug', :platforms => :mri_18
 
 # unreleased so far ... but leap_web_certs need it