diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-05 10:47:23 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-05 10:47:23 +0200 |
| commit | c293cc91522544f5a45fc00b842fc23fa228cdf9 (patch) | |
| tree | 2ed47ab1619d0e57905090b3408025fe66a16b2e /app/views | |
| parent | 0de7c83a78711601b40b5a739070da2e3af29b11 (diff) | |
| download | gitlab-ce-c293cc91522544f5a45fc00b842fc23fa228cdf9.tar.gz | |
Move CI web hooks page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/ci/_nav_project.html.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/nav/_project_settings.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/ci_web_hooks/index.html.haml (renamed from app/views/ci/web_hooks/index.html.haml) | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/views/layouts/ci/_nav_project.html.haml b/app/views/layouts/ci/_nav_project.html.haml index 3a2741367c1..545abc23d99 100644 --- a/app/views/layouts/ci/_nav_project.html.haml +++ b/app/views/layouts/ci/_nav_project.html.haml @@ -11,11 +11,6 @@ %span Commits %span.count= @project.commits.count - = nav_link path: 'web_hooks#index' do - = link_to ci_project_web_hooks_path(@project) do - = icon('link fw') - %span - Web Hooks = nav_link path: ['services#index', 'services#edit'] do = link_to ci_project_services_path(@project) do = icon('share fw') diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml index 26cccb48f68..abee5e1b3f3 100644 --- a/app/views/layouts/nav/_project_settings.html.haml +++ b/app/views/layouts/nav/_project_settings.html.haml @@ -50,6 +50,11 @@ = icon('retweet fw') %span Triggers + = nav_link path: 'web_hooks#index' do + = link_to namespace_project_ci_web_hooks_path(@project.namespace, @project) do + = icon('link fw') + %span + CI Web Hooks = nav_link path: 'ci_settings#edit' do = link_to edit_namespace_project_ci_settings_path(@project.namespace, @project) do = icon('building fw') diff --git a/app/views/ci/web_hooks/index.html.haml b/app/views/projects/ci_web_hooks/index.html.haml index 78e8203b25e..c3fe4db8149 100644 --- a/app/views/ci/web_hooks/index.html.haml +++ b/app/views/projects/ci_web_hooks/index.html.haml @@ -6,7 +6,7 @@ %hr.clearfix -= form_for [:ci, @project, @web_hook], html: { class: 'form-horizontal' } do |f| += form_for @web_hook, url: namespace_project_ci_web_hooks_path(@project.namespace, @project), html: { class: 'form-horizontal' } do |f| -if @web_hook.errors.any? .alert.alert-danger - @web_hook.errors.full_messages.each do |msg| @@ -28,9 +28,9 @@ %span.monospace= hook.url %td .pull-right - - if @project.commits.any? - = link_to 'Test Hook', test_ci_project_web_hook_path(@project, hook), class: "btn btn-sm btn-grouped" - = link_to 'Remove', ci_project_web_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped" + - if @ci_project.commits.any? + = link_to 'Test Hook', test_namespace_project_ci_web_hook_path(@project.namespace, @project, hook), class: "btn btn-sm btn-grouped" + = link_to 'Remove', namespace_project_ci_web_hook_path(@project.namespace, @project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped" %h4 Web Hook data example |