diff options
| author | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 16:00:25 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 16:00:25 +0300 |
| commit | 76a17d4f5440184fb9809fef3d57c98f2642ea09 (patch) | |
| tree | f229a3e47522c5befac9ea4f81b953d6fa64791e /app | |
| parent | 2ec93abed7a1a3aa49b3267342824e0743de0f54 (diff) | |
| parent | 73ba411af9f4552e72230d2b9852399e66a23260 (diff) | |
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')
| -rw-r--r-- | app/views/admin/runners/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/_runner.html.haml | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml index 08af124274b..2168294c683 100644 --- a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml +++ b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml @@ -12,7 +12,7 @@ - else The source branch will not be removed. - - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch + - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch && @merge_request.merge_user == current_user - user_can_cancel_automatic_merge = @merge_request.can_cancel_merge_when_build_succeeds?(current_user) - if remove_source_branch_button || user_can_cancel_automatic_merge .clearfix.prepend-top-10 diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 4d95afc28bb..47ec420189d 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -18,7 +18,7 @@ - runner_project = @project.runner_projects.find_by(runner_id: runner) = link_to 'Disable for this project', namespace_project_runner_project_path(@project.namespace, @project, runner_project), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm' - elsif runner.specific? - = form_for [@project.namespace, @project, @project.runner_projects.new] do |f| + = form_for [@project.namespace.becomes(Namespace), @project, @project.runner_projects.new] do |f| = f.hidden_field :runner_id, value: runner.id = f.submit 'Enable for this project', class: 'btn btn-sm' .pull-right |