Commit graph

3003 commits

Author SHA1 Message Date
Sam Coe
71a66cc8d6
Fix merge 2021-01-21 12:53:04 -08:00
Sam Coe
a9123966e3
Merge branch 'trunk' into 1190-limit-merge-methods 2021-01-21 12:45:10 -08:00
Nate Smith
4860cccd72
Merge pull request #2282 from cristiand391/repo-fork-gitflags
Add support for git flags in gh repo fork
2021-01-21 12:11:42 -08:00
vilmibm
48c89076f6 add positive case test 2021-01-21 12:04:19 -08:00
vilmibm
a27a94f8b5 Merge remote-tracking branch 'origin/trunk' into repo-fork-gitflags 2021-01-21 11:58:20 -08:00
Sam
938f6f4bdd
Merge pull request #2809 from cli/deadcode
delete unused parameter
2021-01-21 09:56:15 -08:00
Sam
948088a143
Merge pull request #2776 from cli/pr-comments
Comment on pull requests
2021-01-21 09:55:52 -08:00
Mislav Marohnić
a70b69e359
Bring the "Press Enter" UI closer to the authentication experience
- "Press Enter" is both bold
- "Enter" is capitalized
- The prompt ends with "..."
2021-01-21 09:47:38 -08:00
Sam Coe
a26fba7800
Comment on pull requests 2021-01-21 09:47:38 -08:00
Mislav Marohnić
10b1314dc1 Hide ssh-key command until it's ready for prime-time 2021-01-21 17:55:44 +01:00
Mislav Marohnić
f89346f335
Merge pull request #2748 from cli/makefile-rewrite
Port build tasks to Go script
2021-01-21 17:36:36 +01:00
Mislav Marohnić
ad62d6a471
Merge pull request #2798 from cli/pr-merge-crossrepo
Handle case when a cross-repo PR was already merged
2021-01-21 17:36:00 +01:00
Mislav Marohnić
4158209d50
Merge pull request #2811 from cli/utils-spinner-buh-bye
Retire utils.Spinner in favor of IOStreams.StartProgressIndicator
2021-01-21 17:34:39 +01:00
Mislav Marohnić
3673a9beb2 Add more documentation for script/build.go 2021-01-21 17:16:11 +01:00
Mislav Marohnić
f1a9da40a4
Merge pull request #2812 from cli/updater-dev-version-match
Update notifier: avoid false positives when gh is built from source
2021-01-21 15:11:23 +01:00
Nate Smith
655728965d
Merge pull request #1882 from dfireBird/remote-renaming-847
feat: implement prompt for remote renaming
2021-01-20 16:19:10 -08:00
vilmibm
509e5dd0c9 fix tests 2021-01-20 16:10:56 -08:00
vilmibm
99c312e8ce accept a remote name instead of doing magic remote naming in repo fork 2021-01-20 15:32:19 -08:00
vilmibm
03f99a0140 Merge remote-tracking branch 'origin/trunk' into remote-renaming-847 2021-01-20 15:10:20 -08:00
Nate Smith
5430728a0a
Merge pull request #2813 from cli/token-from-env-err
More descriptive error when aborting auth due to environment variables
2021-01-20 15:06:52 -08:00
Björn Heinrichs
c9f79271b1
Add --maintainer-edit flag (#2250)
* Add --maintainer-edit flag

Closes #2213 while retaining backwards compatibility.

* Fix linting

* Adjust documentation and validation

* Negate logic and fix build errors

* rename to no-maintainer-edit

* test

* use a positive option instead of negative

Co-authored-by: vilmibm <vilmibm@github.com>
2021-01-20 14:51:27 -08:00
Sam
3bec668aaa
Merge pull request #2757 from cli/review-comments
Display reviews when viewing pull requests
2021-01-20 12:22:03 -08:00
Sam Coe
b9b1079493
Display reviews when viewing pull requests 2021-01-20 12:15:25 -08:00
Mislav Marohnić
dcf5a27f53
Merge pull request #1862 from edualb/trunk
[#1755] SSH key management (gh ssh-key list)
2021-01-20 20:47:21 +01:00
Mislav Marohnić
4a2cc8d2a4 Simplify ssh-key list
Do not require nor request `read:public_key` scope by default.
2021-01-20 20:23:57 +01:00
edualb
e26a1b98a1 add ssh-key command 2021-01-20 20:23:38 +01:00
Cristian Dominguez
2086d135f3
Respect system/user timezone in API requests (#2630)
* Respect system/user timezone in API requests

* Fall back to a known timezone if TZ is not set

Co-authored-by: Cristian Dominguez <cristiand391@users.noreply.github.com>
2021-01-20 10:44:46 -08:00
Mislav Marohnić
c9407b2629 More descriptive error when aborting auth due to environment variables
Old message:

    read-only token in GH_TOKEN cannot be modified

This message was vague and some users did not understand that this
refers to the value that is read from environment variables.

New message:

    $ GH_TOKEN=123 ghd auth login -h github.com
    The value of the GH_TOKEN environment variable is being used for authentication.
    To have GitHub CLI store credentials instead, first clear the value from the environment.
2021-01-20 18:27:35 +01:00
Mislav Marohnić
82d19b73d6 Update notifier: avoid false positives when gh is built from source
When gh was built from source, the version number will look something
like this since it's taken from `git describe`:

    v1.4.0-34-g{SHA}

When compared as semver against `v1.4.0`, the latter version is falsely
reported as newer. This is because the output of `git describe` wasn't
meant to be interpreted as semver.

The solution is to translate the `git describe` string to faux-semver so
it can be safely compared with the version reported from the server.

Fixes this case:

    A new release of gh is available: v1.4.0-41-g2f9e4cb1 → v1.4.0
    https://github.com/cli/cli/releases/tag/v1.4.0
2021-01-20 16:13:50 +01:00
Mislav Marohnić
a2bee1fad3 🔥 utils.Spinner 2021-01-20 14:48:14 +01:00
Mislav Marohnić
aa0de5f636 Stop using utils.Spinner in repo fork 2021-01-20 14:46:45 +01:00
vilmibm
3797aa72ff delete unused parameter 2021-01-19 19:08:49 -08:00
Mislav Marohnić
b5366c6ebf
Merge pull request #2794 from cristiand391/use-testify-assertion
Use Testify assertions in tests
2021-01-19 14:08:25 +01:00
Mislav Marohnić
75ebb863e3 Use testify assertions for error matching 2021-01-19 13:59:37 +01:00
Cristian Dominguez
45f4a1f087 Equal: flip arguments position 2021-01-18 21:00:59 -03:00
Mislav Marohnić
6e5a90821c pr merge: handle case when a cross-repo PR was already merged
In this case, do not ever offer to delete the branch.
2021-01-18 19:49:20 +01:00
Mislav Marohnić
e566c61671
Merge pull request #2789 from dpromanko/dpromanko/2625 2021-01-18 18:41:01 +01:00
Mislav Marohnić
66546e2245 When pr merge --delete-branch flag is supplied, avoid prompting for it 2021-01-18 18:10:20 +01:00
Cristian Dominguez
3afb1d0b1a Use Testify assertions in test 2021-01-16 19:19:30 -03:00
Devon Romanko
df31fae9c6 remove prompt for deleting branches on pr merge in interactive mode when -d flag is passed 2021-01-15 17:34:00 -05:00
Devon Romanko
2c35eb04ff address pr comments 2021-01-15 16:54:46 -05:00
Devon Romanko
85e0e44920 Add prompt to delete local branch when attempting to merge a PR that is already merged 2021-01-15 07:25:24 -05:00
Mislav Marohnić
4750e4ae18
Merge pull request #2774 from rneatherway/codeql-add-pull-request-trigger
Add on: pull_request trigger to CodeQL workflow
2021-01-13 14:40:38 +01:00
Robin Neatherway
3ab01661e4 Add on: pull_request trigger to CodeQL workflow
From February 2021, in order to provide feedback on pull requests, Code Scanning workflows must be configured with both `push` and `pull_request` triggers. This is because Code Scanning compares the results from a pull request against the results for the base branch to tell you only what has changed between the two.

Early in the beta period we supported displaying results on pull requests for workflows with only `push` triggers, but have discontinued support as this proved to be less robust.

See https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#scanning-pull-requests for more information on how best to configure your Code Scanning workflows.
2021-01-13 11:09:00 +00:00
Sam
b0ae09e627
Merge pull request #2535 from cli/create-comments
Create issue comments
2021-01-12 11:24:09 -08:00
Mislav Marohnić
3985577de0
Merge pull request #2759 from cristiand391/migrate-legacy-tests
Migrate legacy HTTP tests
2021-01-12 18:20:45 +01:00
Cristian Dominguez
ce151420f3 Migrate legacy tests 2021-01-11 21:07:19 -03:00
Sam Coe
723e9e31ba
Address PR comments 2021-01-11 13:56:17 -08:00
Mislav Marohnić
c73845ee22
Merge pull request #2742 from cli/linter-update
Simplify linter output setup
2021-01-11 15:32:18 +01:00
Mislav Marohnić
39431a101d Port select portions of Makefile to script/build.go
This is to enable build tasks on Windows.
2021-01-08 22:35:57 +01:00