vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2571 from kbrwn/gitlab-setup-update

Browse source 
updates to gitlab setup
This commit is contained in:
Kyle Brown 2017-04-24 13:30:13 -07:00 • committed by GitHub
commit 1ca51146e7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
static/directives/config/config-setup-tool.html
View file

@ -185,7 +185,7 @@
<div class="co-panel-body"> <div class="co-panel-body">
<div class="description"> <div class="description">
<p>Time machine keeps older copies of tags within a repository for the configured period <p>Time machine keeps older copies of tags within a repository for the configured period
of time, after whichn they are garbage collected. This allows users to of time, after which they are garbage collected. This allows users to
revert tags to older images in case they accidentally pushed a broken image. It is revert tags to older images in case they accidentally pushed a broken image. It is
highly recommended to have time machine enabled, but it does take a bit more space highly recommended to have time machine enabled, but it does take a bit more space
in storage. in storage.
@ -1255,7 +1255,7 @@
<p> <p>
<strong>Note:</strong> A registered GitLab OAuth application is required. <strong>Note:</strong> A registered GitLab OAuth application is required.
Visit the Visit the
<a href="{{ config.GITLAB_TRIGGER_CONFIG.GITLAB_ENDPOINT || 'https://gitlab.com' }}/admin/applications" ng-safenewtab> <a href="{{ config.GITLAB_TRIGGER_CONFIG.GITLAB_ENDPOINT || 'https://gitlab.com' }}/profile/applications" ng-safenewtab>
GitLab applications admin panel GitLab applications admin panel
</a> </a>
to create a new application. to create a new application.
@ -1293,14 +1293,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>OAuth Client ID:</td> <td>Application Id:</td>
<td> <td>
<span class="config-string-field" binding="config.GITLAB_TRIGGER_CONFIG.CLIENT_ID"> <span class="config-string-field" binding="config.GITLAB_TRIGGER_CONFIG.CLIENT_ID">
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>OAuth Client Secret:</td> <td>Secret:</td>
<td> <td>
<span class="config-string-field" binding="config.GITLAB_TRIGGER_CONFIG.CLIENT_SECRET"> <span class="config-string-field" binding="config.GITLAB_TRIGGER_CONFIG.CLIENT_SECRET">
</span> </span>