diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-07-20 15:14:22 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-20 15:14:22 +0900 |
| commit | acaf13d6f32157716c0d6a9b1d475c042881895c (patch) | |
| tree | bf4fe5084c4c0165484f64201fdabb38d5f507d5 | |
| parent | 03c72d71bb20a45b13d694d3c966afdc488b0a37 (diff) | |
| download | gitlab-ce-acaf13d6f32157716c0d6a9b1d475c042881895c.tar.gz | |
Add an id for the tag(#registration_token). Wrap long lines.
| -rw-r--r-- | app/views/admin/runners/index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/ci/runner/_how_to_setup_runner.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/_specific_runners.html.haml | 4 | ||||
| -rw-r--r-- | spec/features/admin/admin_runners_spec.rb | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index 9aedc1ce768..126550ee10e 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -35,7 +35,9 @@ method: :put, class: 'btn btn-default', data: { confirm: _("Are you sure you want to reset registration token?") } - = render partial: 'ci/runner/how_to_setup_runner', locals: {registration_token: current_application_settings.runners_registration_token, type: 'shared'} + = render partial: 'ci/runner/how_to_setup_runner', + locals: { registration_token: current_application_settings.runners_registration_token, + type: 'shared' } .append-bottom-20.clearfix .pull-left diff --git a/app/views/ci/runner/_how_to_setup_runner.html.haml b/app/views/ci/runner/_how_to_setup_runner.html.haml index 70a1db84a58..b4faeafdc89 100644 --- a/app/views/ci/runner/_how_to_setup_runner.html.haml +++ b/app/views/ci/runner/_how_to_setup_runner.html.haml @@ -9,7 +9,7 @@ %li = _("Specify the following URL during the Runner setup:") %code= root_url(only_path: false) - %li + %li#registration_token = _("Use the following registration token during setup:") %code= registration_token %li diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml index a8ef3c73e4f..28ccbf7eb15 100644 --- a/app/views/projects/runners/_specific_runners.html.haml +++ b/app/views/projects/runners/_specific_runners.html.haml @@ -1,6 +1,8 @@ %h3 Specific Runners -= render partial: 'ci/runner/how_to_setup_runner', locals: {registration_token: @project.runners_token, type: 'specific'} += render partial: 'ci/runner/how_to_setup_runner', + locals: { registration_token: @project.runners_token, + type: 'specific' } - if @project_runners.any? %h4.underlined-title Runners activated for this project diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb index a945995e226..716028db513 100644 --- a/spec/features/admin/admin_runners_spec.rb +++ b/spec/features/admin/admin_runners_spec.rb @@ -163,11 +163,11 @@ describe "Admin Runners" do end it 'has a registration token' do - expect(page.find('.help-callout li:nth-of-type(3)')).to have_content(token) + expect(page.find('#registration_token')).to have_content(token) end describe 'reload registration token' do - let(:page_token) { find('.help-callout li:nth-of-type(3) code').text } + let(:page_token) { find('#registration_token code').text } before do click_button 'Reset runners registration token' |