diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-22 19:08:00 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-03-04 22:37:03 -0500 |
| commit | a056dfa9a077def4c3ffb958d3f86f7c9d7c2096 (patch) | |
| tree | d244e57faf58dc2be08c1412c66874c694f8913e /app/views | |
| parent | 3231ea10b7319f6fe50c0ec1407ddaac69089641 (diff) | |
| download | gitlab-ce-a056dfa9a077def4c3ffb958d3f86f7c9d7c2096.tar.gz | |
Refactor GlobalMilestone queries.
Make methods return ActiveRecord Relations instead of Arrays.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/dashboard/milestones/_milestone.html.haml | 2 | ||||
| -rw-r--r-- | app/views/dashboard/milestones/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/milestones/_milestone.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/milestones/show.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/dashboard/milestones/_milestone.html.haml b/app/views/dashboard/milestones/_milestone.html.haml index 7c882a32702..ea6c304d7de 100644 --- a/app/views/dashboard/milestones/_milestone.html.haml +++ b/app/views/dashboard/milestones/_milestone.html.haml @@ -8,7 +8,7 @@ .row .col-sm-6 = link_to issues_dashboard_path(milestone_title: milestone.title) do - = pluralize milestone.issue_count, 'Issue' + = pluralize milestone.issues_count, 'Issue' · = link_to merge_requests_dashboard_path(milestone_title: milestone.title) do = pluralize milestone.merge_requests_count, 'Merge Request' diff --git a/app/views/dashboard/milestones/show.html.haml b/app/views/dashboard/milestones/show.html.haml index 3810267577c..bbe0b0905ce 100644 --- a/app/views/dashboard/milestones/show.html.haml +++ b/app/views/dashboard/milestones/show.html.haml @@ -52,7 +52,7 @@ %li.active = link_to '#tab-issues', 'data-toggle' => 'tab' do Issues - %span.badge= @milestone.issue_count + %span.badge= @milestone.issues_count %li = link_to '#tab-merge-requests', 'data-toggle' => 'tab' do Merge Requests diff --git a/app/views/groups/milestones/_milestone.html.haml b/app/views/groups/milestones/_milestone.html.haml index a20bf75bc39..50558d7dce8 100644 --- a/app/views/groups/milestones/_milestone.html.haml +++ b/app/views/groups/milestones/_milestone.html.haml @@ -8,7 +8,7 @@ .row .col-sm-6 = link_to issues_group_path(@group, milestone_title: milestone.title) do - = pluralize milestone.issue_count, 'Issue' + = pluralize milestone.issues_count, 'Issue' · = link_to merge_requests_group_path(@group, milestone_title: milestone.title) do = pluralize milestone.merge_requests_count, 'Merge Request' diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml index 1233da85524..405df1d3433 100644 --- a/app/views/groups/milestones/show.html.haml +++ b/app/views/groups/milestones/show.html.haml @@ -58,7 +58,7 @@ %li.active = link_to '#tab-issues', 'data-toggle' => 'tab' do Issues - %span.badge= @milestone.issue_count + %span.badge= @milestone.issues_count %li = link_to '#tab-merge-requests', 'data-toggle' => 'tab' do Merge Requests |