gitnex/GitNex

Fork 37

[Pull] Extend Merge Options #217

New issue

Closed

opened 2020-06-03 23:05:15 +00:00 by 6543 · 14 comments

6543 commented

2020-06-03 23:05:15 +00:00

Member

close #212

modes
ui
translation
nice look

Original Pull att :https://gitea.com/gitnex/GitNex/pulls/217

Merged with: 145043a515

close #212 * [x] modes * [x] ui * [x] translation * [x] nice look --- Original Pull att :https://gitea.com/gitnex/GitNex/pulls/217 Merged with: 145043a5157babe9b24787854c54368036aa6225

6543 added this to the 2.5.0 milestone 2020-06-03 23:05:15 +00:00

6543 added the

🎉 Feature

label 2020-06-03 23:05:15 +00:00

6543 closed this issue

2020-06-03 23:05:15 +00:00

6543 self-assigned this 2020-06-03 23:05:56 +00:00

6543 commented

2020-06-03 23:05:56 +00:00

Author

Member

this is ready it (if you mean functionalety).

but the Spinner doesnt look nice and it doesnt use translation for the displayed options ... didn't find a easy solution for this :(

@mmarif do you know how to do this UI stuff?

this is ready it (if you mean functionalety). but the **Spinner** doesnt look nice and it doesnt use translation for the displayed options ... didn't find a easy solution for this :( @mmarif do you know how to do this UI stuff?

mmarif commented

2020-06-03 23:06:16 +00:00

Owner

@6543 sure, I will check the ui if it need tweaks I will do otherwise will merge.

6543 commented

2020-06-03 23:06:36 +00:00

Author

Member

I'll removed the WIP in fafour of the lable - and to be able to use the update button

mmarif commented

2020-06-03 23:06:56 +00:00

Owner

Ok, makes sense.

mmarif commented

2020-06-03 23:07:17 +00:00

Owner

@6543 for most of the part everything works. UI match the app style.

From my tests on 1.11, squash and rebase-merge throw 500 errors. Maybe you can check on your side.

@6543 for most of the part everything works. UI match the app style. From my tests on 1.11, squash and rebase-merge throw 500 errors. Maybe you can check on your side.

6543 commented

2020-06-03 23:07:37 +00:00

Author

Member

@mmarif I'll look into the git log when these options where added if they are added lately I'll add a version check

I'll thest this in gennerel :)

EDIT: this options are included in 1.11.x
EDIT: they where added before v1.8.0; I can't tell you when exactly but this is pointles

@mmarif I'll look into the git log when these options where added if they are added lately I'll add a version check I'll thest this in gennerel :) EDIT: this options are included in 1.11.x EDIT: they where added before v1.8.0; I can't tell you when exactly but this is pointles

mmarif commented

2020-06-03 23:07:57 +00:00

Owner

I am on 1.11.3 and getting 500.

6543 commented

2020-06-03 23:08:17 +00:00

Author

Member

ToDo: add a Title text field and PreFill it with Pull Title and Pull Number: Pulltitle (#number)

ToDo: add a Title text field and PreFill it with Pull Title and Pull Number: `Pulltitle (#number)`

6543 commented

2020-06-03 23:08:37 +00:00

Author

Member

after Pull Title is added I considder it as ready.

@mmarif I'll try to add it :)

after Pull Title is added I considder it as ready. @mmarif I'll try to add it :)

6543 commented

2020-06-03 23:08:57 +00:00

Author

Member

Note: enable squash-merge only on v1.11.5 and higher
(https://github.com/go-gitea/gitea/pull/11039)

Note: enable squash-merge only on v1.11.5 and higher (https://github.com/go-gitea/gitea/pull/11039)

mmarif commented

2020-06-03 23:09:17 +00:00

Owner

add a Title text field and PreFill it with Pull Title and Pull Number

If we add Gitea version check, is this still needed to add title?

enable squash-merge only on v1.11.5 and higher

squash and rebase-merge both. Can be done in the setMergeAdapter() function.

> add a Title text field and PreFill it with Pull Title and Pull Number If we add Gitea version check, is this still needed to add title? > enable squash-merge only on v1.11.5 and higher squash and rebase-merge both. Can be done in the setMergeAdapter() function.

6543 commented

2020-06-03 23:09:37 +00:00

Author

Member

removed wrong lable 😅

-> to 616a101fe7 Android Studio suggested me this change but I don't know what to think of ..

@mmarif I considder this as ready 🎉 🎆

removed wrong lable :sweat_smile: -> to https://gitea.com/gitnex/GitNex/commit/616a101fe741a1aaad30fdbb3bb05ef580cb554a Android Studio suggested me this change but I don't know what to think of .. @mmarif I considder this as ready :tada: :fireworks:

mmarif commented

2020-06-03 23:09:57 +00:00

Owner

I have pushed some minor changes. Ready from my side.

Should I merge now?

I have pushed some minor changes. Ready from my side. Should I merge now?

6543 commented

2020-06-03 23:10:18 +00:00

Author

Member

looked at your changes - nothing against them to say -this pull is ready 🚀 @mmarif

looked at your changes - nothing against them to say -this pull is ready :rocket: @mmarif