Merge "Upgrade jest to 2.0.3"
diff --git a/WORKSPACE b/WORKSPACE
index 4031a5f..3be5fab 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -514,34 +514,34 @@
sha1 = '0c9cfae15c74f62491d4f28def0dff1dabe52a47',
)
-PROLOG_VERS = '1.4.1'
+PROLOG_VERS = '1.4.2'
maven_jar(
name = 'prolog_runtime',
repository = 'http://gerrit-maven.storage.googleapis.com/',
artifact = 'com.googlecode.prolog-cafe:prolog-runtime:' + PROLOG_VERS,
- sha1 = 'c5d9f92e49c485969dcd424dfc0c08125b5f8246',
+ sha1 = '4421b4806b6e3a318680f6ab1d57569e857169c6',
)
maven_jar(
name = 'prolog_compiler',
repository = 'http://gerrit-maven.storage.googleapis.com/',
artifact = 'com.googlecode.prolog-cafe:prolog-compiler:' + PROLOG_VERS,
- sha1 = 'ac24044c6ec166fdcb352b78b80d187ead3eff41',
+ sha1 = '7e5a7ca5efe7db7f69e015cf492f8f04665244d8',
)
maven_jar(
name = 'prolog_io',
repository = 'http://gerrit-maven.storage.googleapis.com/',
artifact = 'com.googlecode.prolog-cafe:prolog-io:' + PROLOG_VERS,
- sha1 = 'b072426a4b1b8af5e914026d298ee0358a8bb5aa',
+ sha1 = 'd177f6211d1013e0f31a507127f5c87a7f6941f3',
)
maven_jar(
name = 'cafeteria',
repository = 'http://gerrit-maven.storage.googleapis.com/',
artifact = 'com.googlecode.prolog-cafe:prolog-cafeteria:' + PROLOG_VERS,
- sha1 = '8cbc3b0c19e7167c42d3f11667b21cb21ddec641',
+ sha1 = '11f396cb2588b65e6a78070488aaa58d12bf000e',
)
maven_jar(
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
index 41fe1a1..2479c87 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
@@ -15,9 +15,9 @@
messageShowInReviewCategoryAbbrev = Show Abbreviated Name
emailFieldLabel = Email Notifications:
-messageEnabled = Enabled
-messageCCMeOnMyComments = CC Me On Comments I Write
-messageDisabled = Disabled
+messageCCMeOnMyComments = Every Comment
+messageEnabled = Only Comments Left By Others
+messageDisabled = None
defaultBaseForMerges = Default Base For Merges:
autoMerge = Auto Merge
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
index 6bdeac6..3bfc7da 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
@@ -95,13 +95,13 @@
GeneralPreferencesInfo.ReviewCategoryStrategy.ABBREV.name());
emailStrategy = new ListBox();
- emailStrategy.addItem(Util.C.messageEnabled(),
- GeneralPreferencesInfo.EmailStrategy.ENABLED.name());
emailStrategy
.addItem(
Util.C.messageCCMeOnMyComments(),
GeneralPreferencesInfo.EmailStrategy.CC_ON_OWN_COMMENTS
.name());
+ emailStrategy.addItem(Util.C.messageEnabled(),
+ GeneralPreferencesInfo.EmailStrategy.ENABLED.name());
emailStrategy
.addItem(
Util.C.messageDisabled(),
diff --git a/lib/prolog/BUCK b/lib/prolog/BUCK
index 77fe5ac..854b0f7 100644
--- a/lib/prolog/BUCK
+++ b/lib/prolog/BUCK
@@ -1,12 +1,12 @@
include_defs('//lib/maven.defs')
-VERSION = '1.4.1'
+VERSION = '1.4.2'
REPO = GERRIT
maven_jar(
name = 'runtime',
id = 'com.googlecode.prolog-cafe:prolog-runtime:' + VERSION,
- sha1 = 'c5d9f92e49c485969dcd424dfc0c08125b5f8246',
+ sha1 = '4421b4806b6e3a318680f6ab1d57569e857169c6',
license = 'prologcafe',
repository = REPO,
)
@@ -14,7 +14,7 @@
maven_jar(
name = 'compiler',
id = 'com.googlecode.prolog-cafe:prolog-compiler:' + VERSION,
- sha1 = 'ac24044c6ec166fdcb352b78b80d187ead3eff41',
+ sha1 = '7e5a7ca5efe7db7f69e015cf492f8f04665244d8',
license = 'prologcafe',
repository = REPO,
deps = [
@@ -26,7 +26,7 @@
maven_jar(
name = 'io',
id = 'com.googlecode.prolog-cafe:prolog-io:' + VERSION,
- sha1 = 'b072426a4b1b8af5e914026d298ee0358a8bb5aa',
+ sha1 = 'd177f6211d1013e0f31a507127f5c87a7f6941f3',
license = 'prologcafe',
repository = REPO,
deps = [':runtime'],
@@ -36,7 +36,7 @@
maven_jar(
name = 'cafeteria',
id = 'com.googlecode.prolog-cafe:prolog-cafeteria:' + VERSION,
- sha1 = '8cbc3b0c19e7167c42d3f11667b21cb21ddec641',
+ sha1 = '11f396cb2588b65e6a78070488aaa58d12bf000e',
license = 'prologcafe',
repository = REPO,
deps = [
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html
index 4f1cb87..8194c21 100644
--- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html
+++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html
@@ -165,10 +165,9 @@
<select
is="gr-select"
bind-value="{{_localPrefs.email_strategy}}">
- <option value="ENABLED">Enabled</option>
- <option
- value="CC_ON_OWN_COMMENTS">CC Me On Comments I Write</option>
- <option value="DISABLED">Disabled</option>
+ <option value="CC_ON_OWN_COMMENTS">Every Comment</option>
+ <option value="ENABLED">Only Comments Left By Others</option>
+ <option value="DISABLED">None</option>
</select>
</span>
</section>
diff --git a/polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter.js b/polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter.js
index f380dd9..f6117e4 100644
--- a/polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter.js
+++ b/polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter.js
@@ -21,7 +21,7 @@
var TimeFormats = {
TIME_12: 'h:mm A', // 2:14 PM
- TIME_24: 'H:mm', // 14:14
+ TIME_24: 'HH:mm', // 14:14
MONTH_DAY: 'MMM DD', // Aug 29
MONTH_DAY_YEAR: 'MMM DD, YYYY', // Aug 29, 1997
};
diff --git a/polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter_test.html b/polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter_test.html
index d1886e7..8d65bc3 100644
--- a/polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter_test.html
@@ -98,13 +98,13 @@
test('More than 24 hours but less than six months', function(done) {
testDates('2015-07-29 20:34:14.985000000',
'2015-06-15 03:25:14.985000000',
- 'Jun 15', 'Jun 15, 2015, 3:25', done);
+ 'Jun 15', 'Jun 15, 2015, 03:25', done);
});
test('More than six months', function(done) {
testDates('2015-09-15 20:34:00.000000000',
'2015-01-15 03:25:00.000000000',
- 'Jan 15, 2015', 'Jan 15, 2015, 3:25', done);
+ 'Jan 15, 2015', 'Jan 15, 2015, 03:25', done);
});
});
@@ -174,7 +174,7 @@
});
test('Default preferences are respected', function() {
- assert.equal(element._timeFormat, 'H:mm');
+ assert.equal(element._timeFormat, 'HH:mm');
assert.isFalse(element._relative);
});
});
