Merge "Simplify GrReporting.appStarted() to use this.now()"
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index 4dea01d..a994711 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -2585,30 +2585,30 @@
)]}'
{
- "commit":{
- "parents":[
+ "commit": {
+ "parents": [
{
- "commit":"1eee2c9d8f352483781e772f35dc586a69ff5646",
+ "commit": "1eee2c9d8f352483781e772f35dc586a69ff5646",
}
],
- "author":{
- "name":"Shawn O. Pearce",
- "email":"sop@google.com",
- "date":"2012-04-24 18:08:08.000000000",
- "tz":-420
+ "author": {
+ "name": "Shawn O. Pearce",
+ "email": "sop@google.com",
+ "date": "2012-04-24 18:08:08.000000000",
+ "tz": -420
},
- "committer":{
- "name":"Shawn O. Pearce",
- "email":"sop@google.com",
- "date":"2012-04-24 18:08:08.000000000",
- "tz":-420
+ "committer": {
+ "name": "Shawn O. Pearce",
+ "email": "sop@google.com",
+ "date": "2012-04-24 18:08:08.000000000",
+ "tz": -420
},
- "subject":"Use an EventBus to manage star icons",
- "message":"Use an EventBus to manage star icons\n\nImage widgets that need to ..."
+ "subject": "Use an EventBus to manage star icons",
+ "message": "Use an EventBus to manage star icons\n\nImage widgets that need to ..."
},
- "base_patch_set_number":1,
- "base_revision":"c35558e0925e6985c91f3a16921537d5e572b7a3",
- "ref":"refs/users/01/1000001/edit-76482/1"
+ "base_patch_set_number": 1,
+ "base_revision": "c35558e0925e6985c91f3a16921537d5e572b7a3",
+ "ref": "refs/users/01/1000001/edit-76482/1"
}
----
@@ -2796,7 +2796,7 @@
)]}'
{
- "web_links":[
+ "web_links": [
{
"show_on_side_by_side_diff_view": true,
"name": "side-by-side preview diff",
@@ -4819,30 +4819,30 @@
)]}'
{
- "commit":{
- "parents":[
+ "commit": {
+ "parents": [
{
- "commit":"1eee2c9d8f352483781e772f35dc586a69ff5646",
+ "commit": "1eee2c9d8f352483781e772f35dc586a69ff5646",
}
],
- "author":{
- "name":"John Doe",
- "email":"john.doe@example.com",
- "date":"2013-05-07 15:21:27.000000000",
- "tz":120
+ "author": {
+ "name": "John Doe",
+ "email": "john.doe@example.com",
+ "date": "2013-05-07 15:21:27.000000000",
+ "tz": 120
},
- "committer":{
- "name":"Jane Doe",
- "email":"jane.doe@example.com",
- "date":"2013-05-07 15:35:43.000000000",
- "tz":120
+ "committer": {
+ "name": "Jane Doe",
+ "email": "jane.doe@example.com",
+ "date": "2013-05-07 15:35:43.000000000",
+ "tz": 120
},
- "subject":"Implement feature X",
- "message":"Implement feature X\n\nWith this feature ..."
+ "subject": "Implement feature X",
+ "message": "Implement feature X\n\nWith this feature ..."
},
- "base_patch_set_number":1,
- "base_revision":"674ac754f91e64a0efb8087e59a176484bd534d1"
- "ref":"refs/users/01/1000001/edit-42622/1"
+ "base_patch_set_number": 1,
+ "base_revision": "674ac754f91e64a0efb8087e59a176484bd534d1"
+ "ref": "refs/users/01/1000001/edit-42622/1"
}
----
diff --git a/Documentation/rest-api-projects.txt b/Documentation/rest-api-projects.txt
index 9803c19..f69c4ae 100644
--- a/Documentation/rest-api-projects.txt
+++ b/Documentation/rest-api-projects.txt
@@ -288,11 +288,11 @@
},
"child-project": {
"id": "child-project",
- "parent":"parent-project"
+ "parent": "parent-project"
},
"parent-project": {
"id": "parent-project",
- "parent":"All-Projects"
+ "parent": "All-Projects"
}
}
----
@@ -1271,14 +1271,14 @@
Content-Type: application/json; charset=UTF-8
{
- "add":{
- "refs/heads/*":{
- "permissions":{
- "read":{
- "rules":{
+ "add": {
+ "refs/heads/*": {
+ "permissions": {
+ "read": {
+ "rules": {
"global:Anonymous-Users": {
- "action":"DENY",
- "force":false
+ "action": "DENY",
+ "force": false
}
}
}
diff --git a/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java b/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java
index 1f3f001..e0eb3f2 100644
--- a/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java
@@ -179,7 +179,7 @@
CREATE_REPLACE,
NORMAL,
AUTOCLOSE,
- };
+ }
@Singleton
private static class Metrics {
diff --git a/plugins/delete-project b/plugins/delete-project
index 3eb70e3..53311c0 160000
--- a/plugins/delete-project
+++ b/plugins/delete-project
@@ -1 +1 @@
-Subproject commit 3eb70e3aee5206bfb9d6c1c4dfdd3c92dab56bae
+Subproject commit 53311c006635e83faaa7a1b68039edebe0fe8e43
diff --git a/plugins/gitiles b/plugins/gitiles
index a25b295..dcd8d7f 160000
--- a/plugins/gitiles
+++ b/plugins/gitiles
@@ -1 +1 @@
-Subproject commit a25b295040d6dfa6b27d42ed10ff0539ab66ac71
+Subproject commit dcd8d7f93ebe21e60688e65fa1261a836a82eb32
diff --git a/plugins/webhooks b/plugins/webhooks
index 47e2f28..064ae07 160000
--- a/plugins/webhooks
+++ b/plugins/webhooks
@@ -1 +1 @@
-Subproject commit 47e2f285e8e21ce8df2a865fa7605d8272aa4d70
+Subproject commit 064ae07f55710034062ef2a36cd030abeee93265
