diff options
| author | Phil Hughes <me@iamphill.com> | 2018-08-02 08:39:05 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-02 08:39:05 +0000 |
| commit | 0233fffe283857d9934460625f9c17fcd278536b (patch) | |
| tree | fe32c22b675a20d2f4eef1ddfa91c4b5ee8fba33 | |
| parent | 28c15d4f94cda8c6635d832d6bde7a131e207023 (diff) | |
| parent | d60f7d0d46a931c92b5d7b50991009a7d9b5612e (diff) | |
| download | gitlab-ce-0233fffe283857d9934460625f9c17fcd278536b.tar.gz | |
Merge branch '49851-link-to-runners' into 'master'
Resolve "Link to the runners page should automatically expand the runners settings"
Closes #49851
See merge request gitlab-org/gitlab-ce!20967
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/49851-link-to-runners.yml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 1f33bb3a129..078f40c4477 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -22,7 +22,7 @@ %br Go to - = link_to project_runners_path(@build.project) do + = link_to project_runners_path(@build.project, anchor: 'js-runners-settings') do Runners page - if @build.starts_environment? diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index be22bbd7a9b..e9f5e62f5e7 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -28,7 +28,7 @@ .settings-content = render 'autodevops_form' -%section.qa-runners-settings.settings.no-animate{ class: ('expanded' if expanded) } +%section.qa-runners-settings.settings.no-animate#js-runners-settings{ class: ('expanded' if expanded) } .settings-header %h4 = _("Runners") diff --git a/changelogs/unreleased/49851-link-to-runners.yml b/changelogs/unreleased/49851-link-to-runners.yml new file mode 100644 index 00000000000..89fd6853bc8 --- /dev/null +++ b/changelogs/unreleased/49851-link-to-runners.yml @@ -0,0 +1,6 @@ +--- +title: Automatically expand runner's settings block when linking to the runner's settings + page +merge_request: +author: +type: other |