opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9'

Browse Source 
* stable-2.9:
  Highlight merge commit on change screen
  Fix testBlockRule_ParentBlocksChild() from RefControlTest
  Documentation: Fix REST API example box width
  Describe new REST endpoints in 2.9 release notes
  Describe most important search updates in 2.9 release notes
  Describe most important access rights updates in 2.9 release notes
  Describe most important SSH updates in 2.9 release notes
  Show parent commits on change screen if merge commit is viewed
  Describe most important documentation updates in 2.9 release notes
  Minor rework of initial version of 2.9 release notes

Conflicts:
	gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
	gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.java
	gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml

Change-Id: I17e552ea0fef78ddb09fb88ccd1a7c80daa53c0f
This commit is contained in:
Edwin Kempin
2014-05-15 08:31:47 +02:00
parent c376f976e9 13dd33918f
commit 21dfa5bd21
10 changed files with 195 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java
View File

@@ -301,7 +301,7 @@ public class RefControlTest {
grant(util.getParentConfig(), PUSH, ANONYMOUS_USERS, "refs/tags/*").setBlock();
ProjectControl u = util.user(local, DEVS);
assertFalse("u can't force update tag", u.controlForRef("refs/tags/V10").canForceUpdate());
assertFalse("u can't update tag", u.controlForRef("refs/tags/V10").canUpdate());
}
@Test