diff options
| author | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 13:00:25 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 13:00:25 +0000 |
| commit | 76a17d4f5440184fb9809fef3d57c98f2642ea09 (patch) | |
| tree | f229a3e47522c5befac9ea4f81b953d6fa64791e /app/views/admin/runners | |
| parent | 2ec93abed7a1a3aa49b3267342824e0743de0f54 (diff) | |
| parent | 73ba411af9f4552e72230d2b9852399e66a23260 (diff) | |
| download | gitlab-ce-76a17d4f5440184fb9809fef3d57c98f2642ea09.tar.gz | |
Merge branch 'master' into ci/persist-registration-token
* master:
Move CI admin builds and runners specs to correct directory
Fix 500 when viewing specific runners on runners page
Fix Ci::Project migration not migrating columns that cannot be NULL
Fix MySQL migration of CI emails
Minor fix in flow 'Merge when build succeeds'
Diffstat (limited to 'app/views/admin/runners')
| -rw-r--r-- | app/views/admin/runners/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml index 32051852dc0..8700b4820cd 100644 --- a/app/views/admin/runners/show.html.haml +++ b/app/views/admin/runners/show.html.haml @@ -60,7 +60,7 @@ = project.name_with_namespace %td .pull-right - = link_to 'Disable', [:admin, project.namespace, project, runner_project], method: :delete, class: 'btn btn-danger btn-xs' + = link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-xs' %table.table %thead |