diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-11 22:34:25 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-05-11 22:34:25 +0200 |
| commit | 2f0d89ecff652418a8323990248b681a91f8e05b (patch) | |
| tree | 678dd598c288b28d562818bf0118a7ee935cd6b5 /app/views | |
| parent | d8c27e4e2b332cb9ece780bfb06155c3d1739d92 (diff) | |
| parent | 459af7ff655d731c4a0f9de0a6202d64468042cb (diff) | |
| download | gitlab-ce-2f0d89ecff652418a8323990248b681a91f8e05b.tar.gz | |
Merge branch 'master' into awardables
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/runners/_runner.html.haml | 12 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index 6745e58deca..36b21eefdee 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -11,18 +11,10 @@ = link_to admin_runner_path(runner) do = runner.short_sha %td - .runner-description - = runner.description - %span (#{link_to 'edit', '#', class: 'edit-runner-link'}) - .runner-description-form.hide - = form_for [:admin, runner], remote: true, html: { class: 'form-inline' } do |f| - .form-group - = f.text_field :description, class: 'form-control' - = f.submit 'Save', class: 'btn' - %span (#{link_to 'cancel', '#', class: 'cancel'}) + = runner.description %td - if runner.shared? - \- + n/a - else = runner.projects.count(:all) %td diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 172579dafda..c33740e23fa 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -27,8 +27,9 @@ %li = link_to dashboard_todos_path, title: 'Todos', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = icon('bell fw') - %span.badge.todos-pending-count - = todos_pending_count + - unless todos_pending_count == 0 + %span.badge.todos-pending-count + = todos_pending_count - if current_user.can_create_project? %li = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do |