Merge branch 'stable-2.9'

* stable-2.9:
  More detailed error message when failing to upload new change
  Keep old timestamps during data migration
  Describe change view preference in review UI documentation
  Add documentation with screenshots for the new review UIs
  Doc: Consistently refer to "Web UI" rather than "WebUI"

Documentation/config-gerrit.txt

@@ -776,7 +776,7 @@ Number of changed lines from which on a change is considered as a large
 change. The number of changed lines of a change is the sum of the lines
 that were inserted and deleted in the change.
 +
-The specified value is used to visualize the change sizes in the web UI
+The specified value is used to visualize the change sizes in the Web UI
 in change tables and user dashboards.
 +
 By default 500.

Documentation/index.txt

@@ -8,6 +8,7 @@
 .. link:http://source.android.com/submit-patches/workflow[Default Android Workflow] (external)
 . Web
 .. Registering a new Gerrit account
+.. link:user-review-ui.html[Reviewing Changes]
 .. link:user-search.html[Searching Changes]
 .. link:user-notify.html[Subscribing to Email Notifications]
 . SSH

Documentation/user-review-ui.txt

@@ -0,0 +1,128 @@
+= Review UI
+
+Reviewing changes is an important task and the Gerrit Web UI provides
+many functionalities to make the review process comfortable and
+efficient. This is a guide through the review UI that explains the
+different functions and UI elements.
+
+[[change-screen]]
+== Change Screen
+
+The change screen shows the details of a single change and provides
+various actions on it.
+
+image::images/user-review-ui-change-screen.png[width=800, link="images/user-review-ui-change-screen.png"]
+
+[[commit-message]]
+=== Commit Message Block
+
+The focus of the change screen is on the commit message since this is
+the most important information about a change. The numeric change ID
+and the change status are displayed right above the commit message.
+
+image::images/user-review-ui-change-screen-commit-message.png[width=800, link="images/user-review-ui-change-screen-commit-message.png"]
+
+The commit message can be edited directly in the Web UI by clicking on
+the `Edit Message` button in the change header. This opens a drop-down
+editor box in which the commit message can be edited. Saving
+modifications of the commit message automatically creates a new patch
+set for the change. The commit message may only be edited on the
+current patch set.
+
+image::images/user-review-ui-change-screen-edit-commit-message.png[width=800, link="images/user-review-ui-change-screen-edit-commit-message.png"]
+
+The numeric change ID is a link to the change and clicking on it
+refreshes the change screen. By copying the link location you can get
+the permalink of the change.
+
+image::images/user-review-ui-change-screen-permalink.png[width=800, link="images/user-review-ui-change-screen-permalink.png"]
+
+The change status shows the state of the change:
+
+- `Needs <label>`:
++
+The change is in review and an approval on the shown label is still
+required to make the change submittable.
+
+- `Not <label>`:
++
+The change is in review and a veto vote on the shown label is
+preventing the submit.
+
+- `Not Current`:
++
+The currently viewed patch set is outdated.
++
+Please note that some operations, like voting, are not available on
+outdated patch sets, but only on the current patch set.
+
+- `Ready to Submit`:
++
+The change has all necessary approvals and may be submitted.
+
+- `Submitted, Merge Pending`:
++
+The change was submitted and was added to the merge queue.
++
+The change stays in the merge queue if it depends on a change that is
+still in review. In this case it will get automatically merged when all
+predecessor changes have been merged.
++
+This status can also mean that the change depends on an abandoned
+change or on an outdated patch set of another change. In this case you
+may want to rebase the change.
+
+- `Merged`:
++
+The change was successfully merged into the destination branch.
+
+- `Abandoned`:
++
+The change was abandoned.
+
+- `Draft`:
++
+The change is a draft that is only visible to the change owner, the
+reviewers that were explicitly added to the change, and users who have
+the link:access-control.html#category_view_drafts[View Drafts] global
+capability assigned.
+
+[[commit-info]]
+=== Commit Info Block
+
+The commit info block shows information about the commit of the
+currently viewed patch set.
+
+It displays the author and the committer as links to a list of this
+person's changes that have the same status as the currently viewed
+change.
+
+The commit ID and the link:user-changeid.html[Change-Id] are both
+displayed with a copy-to-clipboard icon that allows the ID to be copied
+into the clipboard.
+
+If a Git web browser, such as GitWeb or Gitiles, is configured, there
+is also a link to the commit in the Git web browser.
+
+image::images/user-review-ui-change-screen-commit-info.png[width=800, link="images/user-review-ui-change-screen-commit-info.png"]
+
+[[old-change-screen]]
+=== Old Change Screen
+
+In addition to the normal change screen, this Gerrit version still
+includes the old change screen that was used in earlier Gerrit
+versions. Users that want to continue using the old change screen can
+configure it in their preferences under
+`Settings` > `Preferences` > `Change View`:
+
+image::images/user-review-ui-change-view-preference.png[width=800, link="images/user-review-ui-change-view-preference.png"]
+
+[WARNING]
+The old change screen will be removed in a later version of Gerrit.
+
+GERRIT
+------
+Part of link:index.html[Gerrit Code Review]
+
+SEARCHBOX
+---------

gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java

@@ -138,7 +138,8 @@ public class Schema_77 extends SchemaVersion {
   private void migratePatchSetApprovals(ReviewDb db,
       LegacyLabelTypes labelTypes) throws SQLException {
     PreparedStatement stmt = ((JdbcSchema) db).getConnection().prepareStatement(
-        "UPDATE patch_set_approvals SET category_id = ? WHERE category_id = ?");
+        "UPDATE patch_set_approvals SET category_id = ?, granted=granted"
+        + " WHERE category_id = ?");
     try {
       for (LegacyLabelType type : labelTypes.getLegacyLabelTypes()) {
         stmt.setString(1, type.getName());