Skip to content

Commit 6275fa1

Browse files
nhat-phannhat-phan
committed
Fix #88 and update release note for 2020.2
1 parent 7b87f11 commit 6275fa1

File tree

4 files changed

+91
-10
lines changed

4 files changed

+91
-10
lines changed

‎merge-request-integration-ce/doc/release-notes.2020.2.0.html

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,50 @@
11
<html lang="en">
22
<h2>Notable changes</h2>
33
<ul>
4+
<li>Support IDEA 2020.2</li>
5+
<li>
6+
Introduce new Rework flow which helps
7+
<ul>
8+
<li>Display comments and file changes if current branch matches your MR</li>
9+
<li>Jump and address comments more easily</li>
10+
</ul>
11+
<div>Note: because of technical difficulty Reply button only works when open a dialog</div>
12+
</li>
13+
<li>Introduce options to hide UpVote, DownVote or State buttons in toolbar.</li>
14+
<li>Improve configuration area.</li>
15+
<li>Throw all exceptions which may happen inside plugin.</li>
16+
<li>Fix #65: loading data and refreshing not work properly</li>
17+
<li>Fix #88: fetching merge requests error for some timezones</li>
418
</ul>
519

620
<h3>Acknowledgement</h3>
721
<ul>
22+
<li>
23+
Thank
24+
<a target="_blank" href="https://github.com/lohengrin332">lohengrin332</a>,
25+
<a target="_blank" href="https://github.com/jmatthiesen81">jmatthiesen81</a>
26+
for reporting
27+
<a target="_blank" href="https://github.com/nhat-phan/merge-request-integration/issues/86">#86</a>
28+
</li>
29+
<li>
30+
Thank
31+
<a target="_blank" href="https://github.com/johnhenaot">johnhenaot</a>,
32+
<a target="_blank" href="https://github.com/pchelk1n">pchelk1n</a>,
33+
<a target="_blank" href="https://github.com/tlttnz2018">tlttnz2018</a>
34+
for reporting
35+
<a target="_blank" href="https://github.com/nhat-phan/merge-request-integration/issues/87">#87</a>
36+
</li>
37+
<li>
38+
Thank
39+
<a target="_blank" href="https://github.com/srinathanantha">srinathanantha</a>
40+
for reporting
41+
<a target="_blank" href="https://github.com/nhat-phan/merge-request-integration/issues/65">#65</a>
42+
</li>
43+
<li>
44+
Thank
45+
<a target="_blank" href="https://github.com/LuccaPrado">LuccaPrado</a>
46+
for reporting
47+
<a target="_blank" href="https://github.com/nhat-phan/merge-request-integration/issues/88">#88</a>
48+
</li>
849
</ul>
950
</html>

‎merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/_const.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const val SINGLE_MR_CHANGES_WHEN_DOING_CODE_REVIEW_NAME = "Changed Files"
99
const val SINGLE_MR_REWORK_CHANGES_PREFIX = "Files"
1010
const val SINGLE_MR_REWORK_COMMENTS_PREFIX = "Comments"
1111

12-
private const val DEBUG = true
12+
private const val DEBUG = false
1313

1414
val logger = Logger.getInstance("MRI")
1515
fun debug(message: String) {

‎merge-request-integration-ee/doc/release-notes.2020.2.0.html

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,50 @@
11
<html lang="en">
2-
<h2>Notable changes</h2>
3-
<ul>
4-
</ul>
2+
<h2>Notable changes</h2>
3+
<ul>
4+
<li>Support IDEA 2020.2</li>
5+
<li>
6+
Introduce new Rework flow which helps
7+
<ul>
8+
<li>Display comments and file changes if current branch matches your MR</li>
9+
<li>Jump and address comments more easily</li>
10+
</ul>
11+
<div>Note: because of technical difficulty Reply button only works when open a dialog</div>
12+
</li>
13+
<li>Introduce options to hide UpVote, DownVote or State buttons in toolbar.</li>
14+
<li>Improve configuration area.</li>
15+
<li>Throw all exceptions which may happen inside plugin.</li>
16+
<li>Fix #65: loading data and refreshing not work properly</li>
17+
<li>Fix #88: fetching merge requests error for some timezones</li>
18+
</ul>
519

6-
<h3>Acknowledgement</h3>
7-
<ul>
8-
</ul>
20+
<h3>Acknowledgement</h3>
21+
<ul>
22+
<li>
23+
Thank
24+
<a target="_blank" href="https://github.com/lohengrin332">lohengrin332</a>,
25+
<a target="_blank" href="https://github.com/jmatthiesen81">jmatthiesen81</a>
26+
for reporting
27+
<a target="_blank" href="https://github.com/nhat-phan/merge-request-integration/issues/86">#86</a>
28+
</li>
29+
<li>
30+
Thank
31+
<a target="_blank" href="https://github.com/johnhenaot">johnhenaot</a>,
32+
<a target="_blank" href="https://github.com/pchelk1n">pchelk1n</a>,
33+
<a target="_blank" href="https://github.com/tlttnz2018">tlttnz2018</a>
34+
for reporting
35+
<a target="_blank" href="https://github.com/nhat-phan/merge-request-integration/issues/87">#87</a>
36+
</li>
37+
<li>
38+
Thank
39+
<a target="_blank" href="https://github.com/srinathanantha">srinathanantha</a>
40+
for reporting
41+
<a target="_blank" href="https://github.com/nhat-phan/merge-request-integration/issues/65">#65</a>
42+
</li>
43+
<li>
44+
Thank
45+
<a target="_blank" href="https://github.com/LuccaPrado">LuccaPrado</a>
46+
for reporting
47+
<a target="_blank" href="https://github.com/nhat-phan/merge-request-integration/issues/88">#88</a>
48+
</li>
49+
</ul>
950
</html>

‎merge-request-integration/src/main/kotlin/net/ntworld/mergeRequestIntegration/util/DateTimeUtil.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package net.ntworld.mergeRequestIntegration.util
33
import net.ntworld.mergeRequest.DateTime
44
import org.joda.time.DateTimeZone
55
import org.joda.time.format.ISODateTimeFormat
6+
import org.ocpsoft.prettytime.PrettyTime
67
import java.text.SimpleDateFormat
7-
import java.time.ZoneId
88
import java.util.*
9-
import org.ocpsoft.prettytime.PrettyTime
109

1110
object DateTimeUtil {
1211
private val timezone = TimeZone.getTimeZone("UTC")
@@ -21,7 +20,7 @@ object DateTimeUtil {
2120
df
2221
}
2322
private val parser = ISODateTimeFormat.dateTimeParser()
24-
private val localTimeZone = DateTimeZone.forID(ZoneId.systemDefault().id)
23+
private val localTimeZone = DateTimeZone.getDefault()
2524
private val prettyTime = PrettyTime()
2625

2726
@Synchronized

0 commit comments

Comments
 (0)