merges master and fix conflicts

2015-09-10 18:09:19 +02:00
parent 95fc7ea949 b6f9de7e5c
commit 8596df1ea8
9 changed files with 107 additions and 0 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -141,6 +141,10 @@ class User < ActiveRecord::Base
    @@username_max_length ||= self.columns.find { |c| c.name == 'username' }.limit
  end

+  def show_welcome_screen?
+    sign_in_count == 1 && unverified? && !organization
+  end
+
  private

    def validate_username_length