diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-18 01:03:57 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-18 05:10:08 +0300 |
| commit | a41481b85debb324082d1f38fc7a091420cbcb99 (patch) | |
| tree | 5f977749cbf472e80fc898aefa7a916edc9217e8 /app/views | |
| parent | d8a668b7e04516a73cb787b911dd5c412f930336 (diff) | |
Merge branch 'gh-webhooks' into 'master'
Avoid that GitHub import fails when retrieving Webhooks for non GitHub admins
Closes #18729
See merge request !4723
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/import/github/status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml index 6c4a9d68d1f..7486b1423e2 100644 --- a/app/views/import/github/status.html.haml +++ b/app/views/import/github/status.html.haml @@ -6,7 +6,7 @@ %p %i.fa.fa-warning - To import GitHub pull requests, any pull request source branches that had been deleted are temporarily restored on GitHub. To prevent any connected CI services from being overloaded with dozens of irrelevant branches being created and deleted again, GitHub webhooks are temporarily disabled during the import process. + To import GitHub pull requests, any pull request source branches that had been deleted are temporarily restored on GitHub. To prevent any connected CI services from being overloaded with dozens of irrelevant branches being created and deleted again, GitHub webhooks are temporarily disabled during the import process, but only if you have admin access to the GitHub repository. %p.light Select projects you want to import. |