gerrit/gerrit-gwtexpui
David Pursehouse c1ec3a765b Merge branch 'stable-2.12'
* stable-2.12:
  config-gerrit: Add missing database types
  config-gerrit: List database types in alphabetical order
  Submit: Eliminate confusing error message
  Fix submittabilty of merge commits that resolve conflicts
  Fix display of "Related changes" after change is rebased in web UI
  MergeValidators: Don't assume submitter record exists
  Add migration command for PostgreSQL in 2.12.1 release notes
  doc: fix link to cmd-index-activate.html page
  Update 2.12.1 release notes with more fixes
  Update 2.12.1 release notes
  Fix keyboard shortcuts for non-US keyboards
  SetParent: Explicitly set to All-Projects when not specified
  CreateProject: Explicitly set parent to All-Projects when not specified
  Organize imports
  Release notes for Gerrit 2.12.1
  Show submodule difference properly in side by side view
  Update JGit to 4.1.2.201602141800-r

The change done in I30f2f8a8e ("Fix submittabilty of merge commits that
resolve conflicts") is not compatible with the master branch due to the
database being migrated to notedb, and is reverted by this merge.

This reverts commit 126af24dd5.

Change-Id: I72fb5db6e9edbf2c97c9a3e33b8133887f71beed
2016-03-01 09:42:07 +09:00
..
src Merge branch 'stable-2.12' 2016-03-01 09:42:07 +09:00
BUCK Clippy: replace "drifty" icon with "page_white_copy" from Silk Icons 2016-01-12 15:37:16 +09:00
COPYING Subtree merge in gwtexpui as gerrit-gwtexpui 2013-04-11 14:30:01 -07:00