diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-08-28 08:39:48 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-08-28 08:39:48 +0000 |
| commit | c0ff11820228acbc27369e99db9bbf9a80a8405b (patch) | |
| tree | 6e9be02f71db33ad2be7fdb1a04a586fc2726e47 | |
| parent | 4576d55f44cfec6d6cab0df063ae9c26824222dd (diff) | |
| parent | 748b89ee948c9b2123e86da40c46b71ae27ede80 (diff) | |
| download | gitlab-ce-c0ff11820228acbc27369e99db9bbf9a80a8405b.tar.gz | |
Merge branch '35060-remove-token-field' into 'master'
Remove token field from runners edit form
Closes #35060
See merge request gitlab-org/gitlab-ce!32231
| -rw-r--r-- | app/views/shared/runners/_form.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/35060-remove-token-field.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 | ||||
| -rw-r--r-- | spec/features/admin/admin_runners_spec.rb | 4 |
4 files changed, 5 insertions, 12 deletions
diff --git a/app/views/shared/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml index 559b5aa9c1e..24b4eae0c58 100644 --- a/app/views/shared/runners/_form.html.haml +++ b/app/views/shared/runners/_form.html.haml @@ -26,11 +26,6 @@ = f.check_box :locked, { class: 'form-check-input' } %label.light{ for: :runner_locked }= _('When a runner is locked, it cannot be assigned to other projects') .form-group.row - = label_tag :token, class: 'col-form-label col-sm-2' do - = _('Token') - .col-sm-10 - = f.text_field :token, class: 'form-control', readonly: true - .form-group.row = label_tag :ip_address, class: 'col-form-label col-sm-2' do = _('IP Address') .col-sm-10 diff --git a/changelogs/unreleased/35060-remove-token-field.yml b/changelogs/unreleased/35060-remove-token-field.yml new file mode 100644 index 00000000000..93a7b459dd8 --- /dev/null +++ b/changelogs/unreleased/35060-remove-token-field.yml @@ -0,0 +1,5 @@ +--- +title: Remove token field from runners edit form +merge_request: 32231 +author: +type: fixed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index c8827c683f8..12138d2db3a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12115,9 +12115,6 @@ msgstr "" msgid "Toggles :%{name}: emoji award." msgstr "" -msgid "Token" -msgstr "" - msgid "Tomorrow" msgstr "" diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb index 4ad90c96558..0d5f5df71b6 100644 --- a/spec/features/admin/admin_runners_spec.rb +++ b/spec/features/admin/admin_runners_spec.rb @@ -282,10 +282,6 @@ describe "Admin Runners" do visit admin_runner_path(runner) end - describe 'runner info' do - it { expect(find_field('runner_token').value).to eq runner.token } - end - describe 'projects' do it 'contains project names' do expect(page).to have_content(@project1.full_name) |