diff --git a/Documentation/dev-design.txt b/Documentation/dev-design.txt index 281e68c2c2..4e82507901 100644 --- a/Documentation/dev-design.txt +++ b/Documentation/dev-design.txt @@ -186,7 +186,7 @@ Gerrit is developed as a self-hosting open source project: * link:https://www.gerritcodereview.com/[Project Homepage] * link:https://www.gerritcodereview.com/download/index.html[Release Versions] * link:https://gerrit.googlesource.com/gerrit[Source] -* link:http://code.google.com/p/gerrit/issues/list[Issue Tracking] +* link:https://bugs.chromium.org/p/gerrit/issues/list[Issue Tracking] * link:https://review.source.android.com/[Change Review] diff --git a/Documentation/error-has-duplicates.txt b/Documentation/error-has-duplicates.txt index 0ec6eda8e8..8294c12ddf 100644 --- a/Documentation/error-has-duplicates.txt +++ b/Documentation/error-has-duplicates.txt @@ -10,7 +10,7 @@ Every change is expected to have an unique Change-Id. Since this error should never occur in practice, you should inform your Gerrit administrator if you hit this problem and/or -link:http://code.google.com/p/gerrit/issues/list[open a Gerrit issue]. +link:https://bugs.chromium.org/p/gerrit/issues/list[open a Gerrit issue]. In any case to not be blocked with your work, you can simply create a new Change-Id for your commit and then push it as new change to diff --git a/Documentation/index.txt b/Documentation/index.txt index 1693c18a59..93352d9935 100644 --- a/Documentation/index.txt +++ b/Documentation/index.txt @@ -81,7 +81,7 @@ * link:licenses.html[Licenses and Notices] * link:https://www.gerritcodereview.com/[Homepage] * link:https://www.gerritcodereview.com/download/index.html[Downloads] -* link:http://code.google.com/p/gerrit/issues/list[Issue Tracking] +* link:https://bugs.chromium.org/p/gerrit/issues/list[Issue Tracking] * link:https://gerrit.googlesource.com/gerrit[Source Code] * link:https://www.gerritcodereview.com/about.md[A History of Gerrit Code Review] diff --git a/README.md b/README.md index b2a867fa37..020602f0a2 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ There is a mirror of the repository on [Github](https://github.com/gerrit-review ## Reporting bugs -Please report bugs on the [issue tracker](https://code.google.com/p/gerrit/issues/list). +Please report bugs on the [issue tracker](https://bugs.chromium.org/p/gerrit/issues/list). ## Contribute diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml index 9920c69487..b5156c0f3a 100644 --- a/gerrit-acceptance-framework/pom.xml +++ b/gerrit-acceptance-framework/pom.xml @@ -62,7 +62,7 @@ - http://code.google.com/p/gerrit/issues/list - Google Code Issue Tracker + https://bugs.chromium.org/p/gerrit/issues/list + Gerrit Issue Tracker diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java index e221535ae3..1a173053e0 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -1099,15 +1099,15 @@ public class ChangeIT extends AbstractDaemonTest { @Test public void commitFooters() throws Exception { LabelType verified = category("Verified", - value(1, "Failed"), value(0, "No score"), value(-1, "Passes")); + value(1, "Passes"), value(0, "No score"), value(-1, "Failed")); LabelType custom1 = category("Custom1", value(1, "Positive"), value(0, "No score"), value(-1, "Negative")); LabelType custom2 = category("Custom2", value(1, "Positive"), value(0, "No score"), value(-1, "Negative")); ProjectConfig cfg = projectCache.checkedGet(project).getConfig(); cfg.getLabelSections().put(verified.getName(), verified); - cfg.getLabelSections().put(custom1.getName(), verified); - cfg.getLabelSections().put(custom2.getName(), verified); + cfg.getLabelSections().put(custom1.getName(), custom1); + cfg.getLabelSections().put(custom2.getName(), custom2); String heads = "refs/heads/*"; AccountGroup.UUID anon = SystemGroupBackend.getGroup(ANONYMOUS_USERS).getUUID(); diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index 979efdcae3..023362f2ee 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -62,7 +62,7 @@ - http://code.google.com/p/gerrit/issues/list - Google Code Issue Tracker + https://bugs.chromium.org/p/gerrit/issues/list + Gerrit Issue Tracker diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index e60dfc68fe..77bb111efd 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -62,7 +62,7 @@ - http://code.google.com/p/gerrit/issues/list - Google Code Issue Tracker + https://bugs.chromium.org/p/gerrit/issues/list + Gerrit Issue Tracker diff --git a/gerrit-plugin-archetype/pom.xml b/gerrit-plugin-archetype/pom.xml index 91f8daf60f..d8e3583633 100644 --- a/gerrit-plugin-archetype/pom.xml +++ b/gerrit-plugin-archetype/pom.xml @@ -102,7 +102,7 @@ limitations under the License. - http://code.google.com/p/gerrit/issues/list - Google Code Issue Tracker + https://bugs.chromium.org/p/gerrit/issues/list + Gerrit Issue Tracker diff --git a/gerrit-plugin-gwt-archetype/pom.xml b/gerrit-plugin-gwt-archetype/pom.xml index 3d84181ee0..362b45c85e 100644 --- a/gerrit-plugin-gwt-archetype/pom.xml +++ b/gerrit-plugin-gwt-archetype/pom.xml @@ -102,7 +102,7 @@ limitations under the License. - http://code.google.com/p/gerrit/issues/list - Google Code Issue Tracker + https://bugs.chromium.org/p/gerrit/issues/list + Gerrit Issue Tracker diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 0740830a7b..982d2683c6 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -62,7 +62,7 @@ - http://code.google.com/p/gerrit/issues/list - Google Code Issue Tracker + https://bugs.chromium.org/p/gerrit/issues/list + Gerrit Issue Tracker diff --git a/gerrit-plugin-js-archetype/pom.xml b/gerrit-plugin-js-archetype/pom.xml index 990b660aa1..e22478aeb9 100644 --- a/gerrit-plugin-js-archetype/pom.xml +++ b/gerrit-plugin-js-archetype/pom.xml @@ -102,7 +102,7 @@ limitations under the License. - http://code.google.com/p/gerrit/issues/list - Google Code Issue Tracker + https://bugs.chromium.org/p/gerrit/issues/list + Gerrit Issue Tracker diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateTag.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateTag.java index 6145362f4a..446fa72ab7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateTag.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateTag.java @@ -18,7 +18,6 @@ import static org.eclipse.jgit.lib.Constants.R_REFS; import static org.eclipse.jgit.lib.Constants.R_TAGS; import com.google.common.base.Strings; -import com.google.gerrit.common.ChangeHooks; import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.Permission; import com.google.gerrit.extensions.api.projects.TagInfo; @@ -29,7 +28,6 @@ import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestModifyView; -import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; @@ -65,7 +63,6 @@ public class CreateTag implements RestModifyView { private final GitRepositoryManager repoManager; private final TagCache tagCache; private final GitReferenceUpdated referenceUpdated; - private final ChangeHooks hooks; private String ref; @Inject @@ -73,13 +70,11 @@ public class CreateTag implements RestModifyView { GitRepositoryManager repoManager, TagCache tagCache, GitReferenceUpdated referenceUpdated, - ChangeHooks hooks, @Assisted String ref) { this.identifiedUser = identifiedUser; this.repoManager = repoManager; this.tagCache = tagCache; this.referenceUpdated = referenceUpdated; - this.hooks = hooks; this.ref = ref; } @@ -150,9 +145,6 @@ public class CreateTag implements RestModifyView { referenceUpdated.fire(resource.getNameKey(), ref, ObjectId.zeroId(), result.getObjectId(), identifiedUser.get().getAccount()); - hooks.doRefUpdatedHook(new Branch.NameKey(resource.getNameKey(), ref), - ObjectId.zeroId(), result.getObjectId(), - identifiedUser.get().getAccount()); try (RevWalk w = new RevWalk(repo)) { return ListTags.createTagInfo(result, w); } diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/TestTimeUtil.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestTimeUtil.java index eae5ed99fb..4c71c573fc 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/TestTimeUtil.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestTimeUtil.java @@ -17,10 +17,6 @@ package com.google.gerrit.testutil; import static com.google.common.base.Preconditions.checkState; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.storage.file.FileBasedConfig; -import org.eclipse.jgit.util.FS; -import org.eclipse.jgit.util.SystemReader; import org.joda.time.DateTime; import org.joda.time.DateTimeUtils; import org.joda.time.DateTimeUtils.MillisProvider; @@ -67,57 +63,11 @@ public class TestTimeUtil { return clockMs.getAndAdd(clockStepMs); } }); - - SystemReader.setInstance(null); - final SystemReader defaultReader = SystemReader.getInstance(); - SystemReader r = new SystemReader() { - @Override - public String getHostname() { - return defaultReader.getHostname(); - } - - @Override - public String getenv(String variable) { - return defaultReader.getenv(variable); - } - - @Override - public String getProperty(String key) { - return defaultReader.getProperty(key); - } - - @Override - public FileBasedConfig openUserConfig(Config parent, FS fs) { - return defaultReader.openUserConfig(parent, fs); - } - - @Override - public FileBasedConfig openSystemConfig(Config parent, FS fs) { - return defaultReader.openSystemConfig(parent, fs); - } - - @Override - public long getCurrentTime() { - return clockMs.getAndAdd(clockStepMs); - } - - @Override - public int getTimezone(long when) { - return defaultReader.getTimezone(when); - } - }; - SystemReader.setInstance(r); } - /** - * Reset the clock to use the actual system clock. - *

- * As a side effect, resets the {@link SystemReader} to the original default - * instance. - */ + /** Reset the clock to use the actual system clock. */ public static synchronized void useSystemTime() { DateTimeUtils.setCurrentMillisSystem(); - SystemReader.setInstance(null); } private TestTimeUtil() { diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index 753a4928e0..f5b078e779 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -62,7 +62,7 @@ - http://code.google.com/p/gerrit/issues/list - Google Code Issue Tracker + https://bugs.chromium.org/p/gerrit/issues/list + Gerrit Issue Tracker