diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-27 23:57:48 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-27 23:57:48 +0300 |
| commit | fc17b440f93e61879ef4881aeacbcbca27dcde1c (patch) | |
| tree | 16706bd448000fd7e6371a12b1d44057db1e738e /app/views | |
| parent | e9514c5074bc83a5f41eec403a74298f40523b93 (diff) | |
| parent | 95db00c3e9b7658b1a2a38f62006371988eabe5c (diff) | |
Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'
Move external issue tracker away from yml config
See merge request !1442
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 502e350300a..6c2d5966cbe 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -38,7 +38,7 @@ %i.fa.fa-exclamation-circle %span Issues - - if @project.used_default_issues_tracker? + - if @project.default_issues_tracker? %span.count.issue_counter= @project.issues.opened.count - if project_nav_tab? :merge_requests diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index fde9dc45fc6..31bdbb562a1 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -51,15 +51,6 @@ = f.check_box :issues_enabled %span.descr Lightweight issue tracking system for this project - - if Project.issues_tracker.values.count > 1 - .form-group - = f.label :issues_tracker, "Issues tracker", class: 'control-label' - .col-sm-10= f.select(:issues_tracker, project_issues_trackers(@project.issues_tracker), {}, { disabled: !@project.issues_enabled }) - - .form-group - = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label' - .col-sm-10= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?, class: 'form-control' - .form-group = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label' .col-sm-10 |