From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Wed, 1 Apr 2015 19:58:08 +0000 (+0200)
Subject: Merge pull request #1164 from wallabag/v2-remove-username-in-config
X-Git-Tag: 2.0.0-alpha.0~68
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e3c34bfc06f3ea266a418d6246560f15d3f73e2a;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1164 from wallabag/v2-remove-username-in-config

Remove ability to change username
---

e3c34bfc06f3ea266a418d6246560f15d3f73e2a
diff --cc src/Wallabag/CoreBundle/Entity/User.php
index 1652170f,63ec072c..ff08c8fb
--- a/src/Wallabag/CoreBundle/Entity/User.php
+++ b/src/Wallabag/CoreBundle/Entity/User.php
@@@ -13,10 -14,13 +14,13 @@@ use JMS\Serializer\Annotation\Expose
  /**
   * User
   *
 - * @ORM\Table(name="user")
   * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository")
 + * @ORM\Table
   * @ORM\HasLifecycleCallbacks()
   * @ExclusionPolicy("all")
+  *
+  * @UniqueEntity("email")
+  * @UniqueEntity("username")
   */
  class User implements AdvancedUserInterface, \Serializable
  {