Jacob Schatz 0766936340 Merge branch 'milestones-show-mrs' into 'master' ...

Add merge request data to the progress information on Milestones pages.

## What does this MR do?

Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`.

## Are there points in the code the reviewer needs to double check?

I don't think so.

## Why was this MR needed?

The milestone progress % didn't accurately reflect the open/merged MRs.

## What are the relevant issue numbers?

Fixes #13980

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-16_at_2.12.57_PM](/uploads/99a044ea918b23fe93cef3305c21086e/Screen_Shot_2016-06-16_at_2.12.57_PM.png)

After:

![Screen_Shot_2016-06-16_at_2.12.38_PM](/uploads/be17e723b9c9bbe33099d1f0e94192d0/Screen_Shot_2016-06-16_at_2.12.38_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

cc: @jschatz1

See merge request !4719

2016-06-18 17:09:45 +00:00

..

groups

Add request access for groups

2016-06-14 13:07:26 +02:00

icons

Update activity SVG path

2016-06-09 17:10:10 -05:00

issuable

Merge branch 'issuable-todo-improvements'

2016-06-18 00:42:36 +02:00

members

Address Douwe's feedback

2016-06-17 18:37:53 +02:00

milestones

Add merge request data to the progress information on Milestones pages.

2016-06-16 14:21:40 -06:00

notifications

Small frontend code fixes and restore 8a2d88f commit

2016-06-17 19:57:59 -03:00

projects

Allow users to set custom notifications in projects they don't own and several fixes to code

2016-06-17 12:33:11 -03:00

snippets

Merge branch 'separate-banzai-references' into 'master'

2016-06-01 15:51:59 +00:00

web_hooks

Backported from EE shared form for web hooks

2016-06-03 11:04:27 +01:00

_choose_group_avatar_button.html.haml

Refactor buttons

2015-03-14 00:29:32 -07:00

_clone_panel.html.haml

Redesign project page header

2016-05-19 13:16:57 -05:00

_commit_message_container.html.haml

Added back text used on merge commit message

2016-04-11 17:41:47 +01:00

_confirm_modal.html.haml

Move modal css to separate file and fix danger text for confirmation modal

2016-04-29 19:02:30 +02:00

_event_filter.html.haml

Add fade out to sub nav

2016-05-25 17:14:28 -05:00

_field.html.haml

Hide password in the service settings form

2015-10-02 12:48:57 +03:00

_file_highlight.html.haml

Properly handle bigger files

2016-04-28 21:28:39 +02:00

_group_form.html.haml

Use consistent casing for form field labels

2015-12-02 14:41:54 +01:00

_group_tips.html.haml

Add permission level to groups

2016-03-10 10:38:36 -03:00

_import_form.html.haml

Increase project import timeout from 4 minutes to 15 minutes

2016-02-04 13:41:42 -06:00

_issues.html.haml

Fix style

2016-06-06 11:59:49 -05:00

_label_row.html.haml

Add handler icon to prioritized labels

2016-06-15 10:35:58 -05:00

_labels_row.html.haml

Updated design

2016-06-08 11:45:17 +01:00

_logo.svg

Prevent rasterization artefacts in the logo, and simplify markup.

2016-02-08 04:25:50 +00:00

_merge_requests.html.haml

Don't try to count a relation with aliases

2016-06-10 14:29:08 +01:00

_milestone_expired.html.haml

sort milestones by due_date

2015-12-03 08:53:34 -06:00

_milestones_filter.html.haml

Use top-area component for top page navigation for pages that contains list of items

2016-02-03 18:41:55 +01:00

_new_commit_form.html.haml

Automatically fork a project when not allowed to edit a file.

2015-12-18 10:03:34 +01:00

_new_project_item_select.html.haml

Remove unnecessary icons from buttons

2016-06-08 17:32:49 +03:00

_no_password.html.haml

LDAP users don't need to set a password to Git over HTTP.

2015-02-23 20:04:18 -08:00

_no_ssh.html.haml

Remove Profile::KeysController#new action

2016-03-03 16:13:59 -05:00

_outdated_browser.html.haml

check browser version, blacklisting outdated IE (version < 10)

2014-12-24 16:22:08 +01:00

_project_limit.html.haml

Project limit is reached warning is hidden when the projects_limit is zero

2016-02-19 09:27:43 +01:00

_promo.html.haml

Substituted deprecated forum link with project issues link. [ci skip]

2016-01-25 13:10:11 -06:00

_ref_switcher.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

_service_settings.html.haml

add slack notifications for wiki pages

2016-04-20 08:25:40 +08:00

_show_aside.html.haml

Fix wrong placement of show-aside link

2015-04-27 00:43:02 +02:00

_sort_dropdown.html.haml

Sort by label priority

2016-06-06 11:59:49 -05:00

_visibility_level.html.haml

Add new admin settings

2015-04-26 07:48:19 -06:00

_visibility_radios.html.haml

Fork visibility level fix

2015-07-06 17:40:33 +03:00