[zanata/zanata-server] 5a49f9: fix(account enable): remove activation key entry w...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 5a49f941a9d050f811781b82c1a71e1f04fb358e
      https://github.com/zanata/zanata-server/commit/5a49f941a9d050f811781b82c1a71e1f04fb358e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserAction.java

  Log Message:
  -----------
  fix(account enable): remove activation key entry when account enable by admin

https://zanata.atlassian.net/browse/ZNTA-886


  Commit: 9e06fc02b1ce2abaf8ad73b36c8a1b403e332764
      https://github.com/zanata/zanata-server/commit/9e06fc02b1ce2abaf8ad73b36c8a1b403e332764
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-01-28 (Thu, 28 Jan 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserAction.java

  Log Message:
  -----------
  Merge pull request #1087 from zanata/ZNTA-886-account-enable

fix(account enable): remove activation key entry when account enable by admin


Compare: https://github.com/zanata/zanata-server/compare/a9e63c481074...9e06fc02b1ce