STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3166 commits 87 branches 0 tags 160 MiB
Commit graph

214 commits

Author SHA1 Message Date
Mislav Marohnić
ebc5d01942 Merge remote-tracking branch 'origin' into auto-merge 2021-02-17 15:25:25 +01:00
Mislav Marohnić
203397baf9 Add tests for pr merge --auto/--disable-auto 2021-02-17 15:24:52 +01:00
Mislav Marohnić
ddddd95d73 Allow pr merge --body '' to prevent having the default body applied 2021-02-17 14:38:33 +01:00
Mislav Marohnić
12cf8ef65b Separately query viewerMergeBodyText for GHE compatibility 
GHE versions 2.22 and older will not have this GraphQL field. Avoid the
resulting error and have the command proceeed with empty text as the
default.
 2021-02-17 14:06:27 +01:00
Mislav Marohnić
2b36b09abf
Update wording for auto-merge confirmation 
Co-authored-by: Amanda Pinsker <ampinsk@github.com>
 2021-02-17 12:30:04 +01:00
Nate Smith
c2c211dbed
Merge pull request #2952 from redreceipt/up-to-date 
Adds Branch Up to Date Status
 2021-02-16 12:50:28 -06:00
Mislav Marohnić
3b650a8c56 Fix typo 2021-02-16 16:28:23 +01:00
Mislav Marohnić
57abe45b96 Let the server choose the commit subject for squashed merge 
For single-commit PRs, the commit subject will be the subject of the
head commit and the PR number. For multi-commit PRs, the commit subject
will be the PR title and PR number. Instead of trying to replicate this
logic client-side, omit the `commitHeadline` param and let the server
apply defaults appropriately.

Reverts https://github.com/cli/cli/pull/1627
 2021-02-16 16:17:37 +01:00
Mislav Marohnić
67bfedd56b Add pr merge --auto 2021-02-16 16:01:22 +01:00
Cristian Dominguez
f75bd7280f Pre-populate default merge commit message if no body was provided 2021-02-16 16:01:22 +01:00
Sam Coe
4ea8d25b85 Fix tests and polish 2021-02-16 15:59:44 +01:00
Cristian Dominguez
d57cb56945 Allow editing commit msg when squash merging a PR 2021-02-16 15:59:06 +01:00
Sam Coe
4fdf28d8a4
Change behavior of slice flags for issue edit and pr edit commands 2021-02-12 14:42:21 -08:00
Sam Coe
a47ee660a7
Pr edit command 2021-02-12 10:08:44 -08:00
Sam
4109af9b49
Merge pull request #2915 from cli/issue-edit 
Edit issue command
 2021-02-12 09:50:11 -08:00
Michael Neeley
9be9229a48 adds strict status checks 2021-02-12 08:51:47 -05:00
Michael Neeley
0d55f8648c adds merge state status 2021-02-11 16:27:23 -05:00
Sam Coe
b366802aa1
Edit issue command 2021-02-04 10:54:34 -08:00
Mislav Marohnić
47baf8fb10 pr create: explain how to link an issue 2021-02-03 22:17:31 +01:00
Mislav Marohnić
051fbbc1e1 Merge remote-tracking branch 'origin' into dpromanko/remove-set-cmd-prepare 2021-01-28 22:00:08 +01:00
Mislav Marohnić
88c27934a1 Update some stubs to be closer to how git behaves 2021-01-28 21:58:45 +01:00
Devon Romanko
2964895a77 fix test behavior changes from migration to run.Stub 2021-01-27 18:46:29 -05:00
Sam Coe
52bdcad8ea
Do not display minimized comments 2021-01-27 08:14:46 -08:00
Devon Romanko
cb897fd7e2 remove unused errorStub from 'pr checkout' test 2021-01-27 08:04:57 -05:00
Devon Romanko
a04e0ece71 use Stub instead of SetPrepareCmd in 'pr checkout' tests 2021-01-27 07:53:21 -05:00
Devon Romanko
45bc1d787c use Stub instead of SetPrepareCmd in 'pr view' tests 2021-01-27 07:23:49 -05:00
Devon Romanko
2eed1593ce use Stub instead of SetPrepareCmd in 'pr list' tests 2021-01-26 08:15:13 -05:00
Sam Coe
3f172ad991
Add contional and tests 2021-01-25 13:27:32 -08:00
zamasu
e4b9f7cb8c
Alert unpushed commits when merging a pull request 2021-01-25 12:04:32 -08:00
Sam
8125cd5911
Merge pull request #2117 from fsmiamoto/checkout-detached-head 
Add flag for using detached HEAD to `pr checkout`
 2021-01-25 11:29:36 -08:00
Sam Coe
cec3aa294e
Support detach head for pr checkout 2021-01-25 11:22:33 -08:00
Mislav Marohnić
70c4cbf240 Merge remote-tracking branch 'origin' into success-icon-consistency 2021-01-25 14:57:04 +01:00
Mislav Marohnić
f46bab256c Rename to SuccessIconWithColor 2021-01-25 14:56:39 +01:00
Mislav Marohnić
8cba14b564 💅 cleanup command stub assertions 2021-01-25 13:13:36 +01:00
Devon Romanko
e39c9d8f9f remove new uses of InitCmdStubber after rebase 2021-01-23 08:31:49 -05:00
Devon Romanko
ac5bfc09b8 remove use of deprecated InitCmdStubber 2021-01-23 08:22:11 -05:00
Mislav Marohnić
96fa6e7830 Merge remote-tracking branch 'origin' into success-icon-consistency 2021-01-22 23:56:54 +01:00
Mislav Marohnić
23d68705bc Match color of the success icon with the end state of the record 2021-01-22 23:55:33 +01:00
Nate Smith
6e2c1b33b0
Merge pull request #2224 from divbhasin/1190-limit-merge-methods 
#1190 - limit merge methods
 2021-01-22 14:23:23 -08:00
AliabbasMerchant
1c54db4919 fix: Project Argument working along with --web flag 2021-01-22 23:07:00 +01:00
Mislav Marohnić
874375f01e 💅 pr checkout --force 2021-01-22 22:37:20 +01:00
Neel Redkar
a89fa1ebed add ability to force checkout 2021-01-22 22:29:01 +01:00
Mislav Marohnić
e334a1f10c Add docs for using @me to reference self 2021-01-22 22:14:47 +01:00
Mislav Marohnić
73da25a96d Use concrete type instead of an interface to avoid forced casting 2021-01-22 22:05:33 +01:00
Mislav Marohnić
28c2d042e7 Extend @me replacing behavior to issue list 2021-01-22 22:05:33 +01:00
Marc Lopez
6ad0c57a31 issue/pr create: add "@me" syntax to self-assign 
Signed-off-by: Marc Lopez <marc5.12@outlook.com>
 2021-01-22 20:41:17 +01:00
Mislav Marohnić
06cf2c9f81 Merge remote-tracking branch 'origin' into cmd-stub-new 2021-01-22 16:31:29 +01:00
Nate Smith
4d28c79192
Merge pull request #2810 from ptxmac/ptx/pr-merge-body 
Add body argument to `pr merge` command.
 2021-01-21 15:25:42 -08:00
vilmibm
6decf4384f simplify slightly, add tests 2021-01-21 15:18:08 -08:00
Sam Coe
f09b8a8e78
Add mergeMethodSurvey test 2021-01-21 14:58:10 -08:00