hiiro 0.1.232 → 0.1.233

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/h-pr +2 -1
  3. data/lib/hiiro/version.rb +1 -1
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a0d1ba68ed577241b03e05bbc748dbc880b0c411547a646bdc7bb9c77733f8c3
4
- data.tar.gz: e25ca589b0609094596456dbef9f9afcb83963045dea1e2d809a50c227f4d7cd
3
+ metadata.gz: 998294642c1d69a195fe30bdc06fb48b26825bcf47454dd6b57748877f819dac
4
+ data.tar.gz: 5e74e47755731485eeab5340e09f673aed515d5fe10f87c46283ad88ae945063
5
5
  SHA512:
6
- metadata.gz: 5c3558fd44e96b1b68ead9f8526f05c7de18e56fd0cd7345c77a3d8c649f6a236a82133aecd94676efd988e90dd192804a33120aca15aca73d1394d3c4043f76
7
- data.tar.gz: e1ca686b11cdf7f0d795eb0a03a4275e660af825cf30f01a36563586f5843a75e5a4148bba648cf8b7c9bac264bcbac1b2f2dbb79c7324fedc349621f8e17c39
6
+ metadata.gz: b9c0145e7765252e6d77f17cfd787d152caa7dc0e29d33b5759ba7960a58100c9ba3bb8b3a9e94a5b31cf8b70170546107a3da195797f68546bdb3e42c2c423f
7
+ data.tar.gz: 5dd5b16bee94ad2d442ed42ba4cf8869d33e6a4ca4d357172f1958620860a46029c3f64eb82bb5b0890954357de0818d0f7a9747557ad1bc11027f5967467210
data/bin/h-pr CHANGED
@@ -368,7 +368,8 @@ class PinnedPRManager
368
368
 
369
369
  as_str = as > 0 ? "\e[30;102m#{as}\e[0m" : '-'
370
370
  crs_str = crs > 0 ? "\e[30;103m#{crs}\e[0m" : '-'
371
- reviews_str = "#{as_str}a/#{crs_str}cr"
371
+ conflict_str = pr['mergeable'] == 'CONFLICTING' ? " \e[30;101m[conflicts]\e[0m" : ""
372
+ reviews_str = "#{as_str}a/#{crs_str}cr#{conflict_str}"
372
373
 
373
374
  repo = pr_repo(pr)
374
375
  repo_label = (repo && repo != 'instacart/carrot') ? " [#{repo}]" : ""
data/lib/hiiro/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class Hiiro
2
- VERSION = "0.1.232"
2
+ VERSION = "0.1.233"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hiiro
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.232
4
+ version: 0.1.233
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joshua Toyota