[zanata/zanata-platform] b56409: fix: add max-length to review criteria (#682)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: b564095534e7fffeb6d19c3f028cace1ad782789
      https://github.com/zanata/zanata-platform/commit/b564095534e7fffeb6d19c3f028cace1ad782789
  Author: Alex Eng <aeng at redhat.com>
  Date:   2018-01-22 (Mon, 22 Jan 2018)

  Changed paths:
    M server/zanata-frontend/src/frontend/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
    M server/zanata-frontend/src/frontend/app/components/RejectionsForm/index.js
    M server/zanata-frontend/src/frontend/app/components/TextInput/index.js
    M server/zanata-model/src/main/java/org/zanata/model/ReviewCriteria.java

  Log Message:
  -----------
  fix: add max-length to review criteria (#682)

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


  Commit: a0c3773476a8b24bf4f6b656b6782797ed9caa7e
      https://github.com/zanata/zanata-platform/commit/a0c3773476a8b24bf4f6b656b6782797ed9caa7e
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/ReviewCriteria.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into fix-merge-conflicts


  Commit: 8c099b55dbe35ffad2ea1a817bca5f25a9ceb0b2
      https://github.com/zanata/zanata-platform/commit/8c099b55dbe35ffad2ea1a817bca5f25a9ceb0b2
  Author: kathryngo <kgough at redhat.com>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/ReviewCriteria.java

  Log Message:
  -----------
  Merge pull request #684 from zanata/fix-merge-conflicts

Fix merge conflicts


Compare: https://github.com/zanata/zanata-platform/compare/1a0f490a4436...8c099b55dbe3