Skip to content

Merge develop into main #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Sep 10, 2023
Merged

Merge develop into main #48

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a07397b
Merge pull request #38 from cocoide/main
cocoide Sep 9, 2023
399b06d
fix: protobufからの自動生成コードについて、ディレクトリを変更
mochi-yu Sep 9, 2023
2bbc39e
feat: grpcサーバへの接続処理を実装
mochi-yu Sep 9, 2023
7ce15a0
feat: 設定情報に関するメソッドをentity層に移植
mochi-yu Sep 10, 2023
58b57dd
fix: configを列挙型に変更
mochi-yu Sep 10, 2023
91ded33
feat: gRPCの呼び出しに、設定情報を反映する
mochi-yu Sep 10, 2023
d6ef59d
feat: AIのリソースを切り替えられるように変更
mochi-yu Sep 10, 2023
3bb264d
fix: configの設定を修正
mochi-yu Sep 10, 2023
729ca87
Merge pull request #45 from cocoide/feature/35-use-grpc-serve
cocoide Sep 10, 2023
9fa372a
Merge branch 'develop' of https://github.com/cocoide/commitify into d…
Sep 10, 2023
8f995e5
Merge branch 'main' into develop
mochi-yu Sep 10, 2023
dd1dbd3
bugfix: マージのミスの修正
mochi-yu Sep 10, 2023
1624e0f
✨ "github.com/charmbracelet/bubbles/t "のimport文を追加する。
Akira0809 Sep 10, 2023
1496802
Merge branch 'develop' into feature/edit-commit-message
cocoide Sep 10, 2023
c6d35f8
Merge branch 'develop' of https://github.com/cocoide/commitify into d…
Sep 10, 2023
287fd3b
Merge branch 'develop' into feature/edit-commit-message
mochi-yu Sep 10, 2023
2076c67
Merge pull request #47 from cocoide/feature/edit-commit-message
mochi-yu Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bugfix: マージのミスの修正
  • Loading branch information
@mochi-yu
mochi-yu committed Sep 10, 2023
commit dd1dbd315ddcbb3323cc979dac6ec5d4b8ca8141
2 changes: 1 addition & 1 deletion cmd/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (cm configModel) View() string {
b.WriteString(color.WhiteString("設定内容を選んでください:\n"))
b.WriteString(color.WhiteString(" ↑↓の矢印キーで項目を移動、Enterで選択\n"))

for i, option := range configOption[cm.configKeyIndex] {
for i, option := range configOptionLabel[cm.configKeyIndex] {
if i == cm.configOptionIndex {
b.WriteString(fmt.Sprintf(color.HiCyanString("➡️ %s\n"), option))
} else {
Expand Down