gitnex/GitNex
gitnex/GitNex
Archived
14
57
Fork 14
Code Issues Pull Requests 2 Releases 22 Wiki Activity

Extend Merge Options #217

Merged
mmarif merged 15 commits from 6543/GitNex:extend-merge-dialog into master 2020-04-11 20:20:29 +00:00
Conversation 14 Commits 15 Files Changed 6 +305 -168
6543 commented 2019-11-27 22:53:08 +00:00
Member
Copy Link

close #212

  • modes
  • ui
  • translation
  • nice look
close #212 * [x] modes * [x] ui * [x] translation * [x] nice look
6543 added the
Enhancement
 label 2019-11-27 22:54:02 +00:00
6543 added this to the 2.4.0 milestone 2019-11-27 22:54:09 +00:00
6543 added the
WIP
 label 2019-11-28 11:30:39 +00:00
6543 reviewed 2020-01-21 15:22:42 +00:00
Dismissed
app/src/main/java/org/mian/gitnex/models/MergePullRequest.java Outdated
@ -16,3 +29,4 @@
this.MergeTitleField = MergeTitleField;
}
public enum Mode{
6543 commented 2020-01-21 15:22:42 +00:00
Author
Member

space Mode {

space `Mode {`
6543 commented 2020-01-26 17:08:46 +00:00
Author
Member
Copy Link

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-01-27 11:54:02 +00:00
Owner
Copy Link

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

@6543 sure, I will check the ui if it need tweaks I will do otherwise will merge.
🎉 1
mmarif reviewed 2020-01-29 09:02:12 +00:00
Dismissed
app/src/main/java/org/mian/gitnex/models/MergePullRequest.java Outdated
@ -19,0 +32,4 @@
public enum Mode{
Merge, //merge
Rebase, //rebase
RebaseMerge, //rebase-merge
mmarif commented 2020-01-29 09:02:12 +00:00
Owner

I believe this could be handled properly without enum as it is suppose to be Rebase (--no-ff). I guess its best to be handled in strings than here. In that case this PR might need some work to rewrite the code.

I believe this could be handled properly without enum as it is suppose to be `Rebase (--no-ff)`. I guess its best to be handled in strings than here. In that case this PR might need some work to rewrite the code.
6543 commented 2020-03-13 20:59:56 +00:00
Author
Member

I used an enumbe because api only allow this strings it doesnt ofward the argument to git its an option of the api with 4 posible strings

I used an enumbe because api only allow this strings it doesnt ofward the argument to git its an option of the api with 4 posible strings
mmarif commented 2020-03-14 10:13:50 +00:00
Owner

I am thinking of to have key:value type like in dialog box, spinner etc. That way can have more control over the values and keys can be kept as is to send to the API.

I am thinking of to have `key:value` type like in dialog box, spinner etc. That way can have more control over the values and keys can be kept as is to send to the API.
6543 changed title from [WIP] Extend Merge Options to Extend Merge Options 2020-03-08 13:54:35 +00:00
6543 commented 2020-03-08 13:55:28 +00:00
Author
Member
Copy Link

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

I'll removed the WIP in fafour of the lable - and to be able to use the update button
mmarif commented 2020-03-08 14:01:37 +00:00
Owner
Copy Link

Ok, makes sense.

Ok, makes sense.
6543 started working 2020-03-08 14:11:01 +00:00
6543 canceled time tracking 2020-03-08 14:17:12 +00:00
6543 added
Feature
 and removed
Enhancement
 labels 2020-03-13 20:57:51 +00:00
6543 modified the milestone from 2.4.0 to 2.5.0 2020-03-13 21:21:00 +00:00
mmarif commented 2020-04-09 15:33:51 +00:00
Owner
Copy Link

@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.
Screenshot_20200409_192158.png
26 KiB
Screenshot_20200409_192142.png
19 KiB
Screenshot_20200409_192158.png Screenshot_20200409_192142.png
mmarif added
LGTM-need
 and removed
WIP
 labels 2020-04-09 15:35:42 +00:00
6543 commented 2020-04-09 15:43:04 +00:00
Author
Member
Copy Link

@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-04-09 15:45:34 +00:00
Owner
Copy Link

I am on 1.11.3 and getting 500.

I am on 1.11.3 and getting 500.
6543 commented 2020-04-10 00:41:43 +00:00
Author
Member
Copy Link

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 added the
WIP
 label 2020-04-10 00:41:58 +00:00
6543 commented 2020-04-10 00:42:34 +00:00
Author
Member
Copy Link

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 self-assigned this 2020-04-10 00:42:42 +00:00
6543 commented 2020-04-11 00:11:47 +00:00
Author
Member
Copy Link

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-04-11 06:04:01 +00:00
Owner
Copy Link

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.
👍 1
6543 added
LGTM-done
 and removed
LGTM-need
 labels 2020-04-11 19:18:58 +00:00
6543 added
LGTM-need
 and removed
LGTM-done
WIP
 labels 2020-04-11 19:21:27 +00:00
6543 commented 2020-04-11 19:22:56 +00:00
Author
Member
Copy Link

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-04-11 19:59:44 +00:00
Owner
Copy Link

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-04-11 20:16:06 +00:00
Author
Member
Copy Link

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
👍 1
6543 added
LGTM-done
 and removed
LGTM-need
 labels 2020-04-11 20:18:17 +00:00
mmarif closed this pull request 2020-04-11 20:20:29 +00:00
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
Labels
Clear labels   
Priority-high

   
Accepting-merge-requests

   
API

   
API-dependency

   
Backport

   
Blocked

   
Brainstorming

   
Breaking

Breaking change

  
Bug

   
Changelog

   
CI

   
Cleanup

   
Confirmed

   
Discussion

   
Documentation

   
Duplicate

   
Enhancement

   
External-dependecy

   
F-droid

   
Feature

   
Google-play

   
Improvement

   
Invalid

   
Investigate

   
LGTM-done

legitimation approved

  
LGTM-need

one approval required

  
Long-term

   
Major-release

   
Minor-release

   
Needs-cleanup

   
Needs-feedback

   
Needs-help

   
Priority-critical

   
Priority-low

   
Priority-medium

   
Question

   
Ready

Ready for testing

  
Refactor

   
Regression

   
Release

   
Repository

[Repository] Issues and PRs related to the app repo

  
Security

   
Suggestion

   
Support

   
Testing

   
Translation

   
UI/UX

   
Upstream

   
Website

[Website] Issues and PRs related to the app website

  
WIP
No Label
Priority-high
Accepting-merge-requests
API
API-dependency
Backport
Blocked
Brainstorming
Breaking
Bug
Changelog
CI
Cleanup
Confirmed
Discussion
Documentation
Duplicate
Enhancement
External-dependecy
F-droid
Feature
Google-play
Improvement
Invalid
Investigate
LGTM-done
LGTM-need
Long-term
Major-release
Minor-release
Needs-cleanup
Needs-feedback
Needs-help
Priority-critical
Priority-low
Priority-medium
Question
Ready
Refactor
Regression
Release
Repository
Security
Suggestion
Support
Testing
Translation
UI/UX
Upstream
Website
WIP
Milestone
Clear milestone
No items
No Milestone
2.5.0
Assignees
Clear assignees
No Assignees
6543
2 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: gitnex/GitNex#217
No description provided.
Delete Branch "6543/GitNex:extend-merge-dialog"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?