Merge branch 'release/0.14' into wdtk

Conflicts:
    app/views/request/show.html.erb

1 files changed, 26 insertions, 0 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 96c169604..f380f6f13 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,3 +1,29 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id                     :integer          not null, primary key
+#  email                  :string(255)      not null
+#  name                   :string(255)      not null
+#  hashed_password        :string(255)      not null
+#  salt                   :string(255)      not null
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  email_confirmed        :boolean          default(FALSE), not null
+#  url_name               :text             not null
+#  last_daily_track_email :datetime         default(2000-01-01 00:00:00 UTC)
+#  admin_level            :string(255)      default("none"), not null
+#  ban_text               :text             default(""), not null
+#  about_me               :text             default(""), not null
+#  locale                 :string(255)
+#  email_bounced_at       :datetime
+#  email_bounce_message   :text             default(""), not null
+#  no_limit               :boolean          default(FALSE), not null
+#  receive_email_alerts   :boolean          default(TRUE), not null
+#  address                :string(255)
+#  dob                    :date
+#
+
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe User, "making up the URL name" do