delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Now we already included it in spec_helper.rbwall-clock-time-for-showing-pipeline	Lin Jen-Shin	2016-08-20	1	-2/+0
\|
*	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-08-20	59	-157/+624
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wall-clock-time-for-showing-pipeline * upstream/master: (50 commits) Increased vertical alignment of labels for issues in lists Changed file name Updated spec HAML Changed tests to use JS tests Addressed feedback Made logic simpler by moving away from underscorejs Added tooltip to label value in collapsed sidebar Add play icon SVG Have hover color of builds span full width Fix alignment of icon on commits page Change sleep to wait_for_ajax Added tests Destroy branch delete tooltip when row is removed Move and improvement comment in pipeline fixtures Fix notification_service argument error of declined invitation emails Update contribution acceptance criteria with tests requirements Fixed keyboard shortcuts not working on issue boards Hides tooltip when dragging Fixes issue with cursor not changing when dragging Hides tooltips when dragging issues Add a spec testing a second side effect of `Repository#merge`. drop execute bit ...
\| *	Merge branch '21081-repository-merge-in-progress-merge-commit-sha-spec' into ↵	Douwe Maan	2016-08-19	1	-0/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add a spec testing a second side effect of `Repository#merge`. ## What are the relevant issue numbers? - Closes #21081 - Related to gitlab-org/gitlab-ee!671 - Related to gitlab-org/gitlab-ee#900 See merge request !5886
\| \| *	Add a spec testing a second side effect of `Repository#merge`.21081-repository-merge-in-progress-merge-commit-sha-spec	Timothy Andrew	2016-08-19	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- It sets the `in_progress_merge_commit_sha` variable on the given merge request, so that the branch permissions (developers can merge) check can proceed in the `pre-receive` hook.
\| * \|	Merge branch 'label-tooltip-sidebar-collapsed' into 'master'	Robert Speicher	2016-08-19	7	-4/+161
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tooltip to label value in collapsed sidebar ## What does this MR do? Adds a list of the issuables labels to a tooltip in the collapsed sidebar. Limited to 5 otherwise the list could get crazy long. Closes #19398 See merge request !5232
\| \| * \|	Changed file name	Phil Hughes	2016-08-19	3	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated spec HAML
\| \| * \|	Changed tests to use JS tests	Phil Hughes	2016-08-19	7	-44/+126
\| \| \| \|
\| \| * \|	Addressed feedback	Phil Hughes	2016-08-19	5	-14/+13
\| \| \| \|
\| \| * \|	Made logic simpler by moving away from underscorejs	Phil Hughes	2016-08-19	1	-12/+8
\| \| \| \|
\| \| * \|	Added tooltip to label value in collapsed sidebar	Phil Hughes	2016-08-19	5	-3/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19398
\| * \| \|	Merge branch 'branch-delete-tooltip' into 'master'	Jacob Schatz	2016-08-19	2	-1/+27
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Destroy branch delete tooltip when row is removed ## What does this MR do? Destroys the tooltip when the branch row is deleted. ## What are the relevant issue numbers? Closes #19528 See merge request !5120
\| \| * \| \|	Change sleep to wait_for_ajaxbranch-delete-tooltip	Phil Hughes	2016-08-19	1	-1/+3
\| \| \| \| \|
\| \| * \| \|	Added tests	Phil Hughes	2016-08-19	1	-0/+22
\| \| \| \| \|
\| \| * \| \|	Destroy branch delete tooltip when row is removed	Phil Hughes	2016-08-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19528
\| * \| \| \|	Merge branch 'fix/pipeline-seeds-in-dev-env' into 'master'	Robert Speicher	2016-08-19	1	-42/+57
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve pipeline fixtures in development environment ### What does this MR do? This MR adds further improvements to seeds for development environment: * fixes build artifacts fixtures * fixes build log fixtures * moves unsuccessful jobs to the last triggered stage See merge request !5838
\| \| * \| \| \|	Move and improvement comment in pipeline fixturesfix/pipeline-seeds-in-dev-env	Grzegorz Bizon	2016-08-19	1	-5/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Change name of the class that with pipeline seeds	Grzegorz Bizon	2016-08-18	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Rename file that holds pipeline fixtures in dev env	Grzegorz Bizon	2016-08-18	1	-0/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Reduce the number of build fixtures created in dev	Grzegorz Bizon	2016-08-18	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Reorder failed stages and improve build statuses	Grzegorz Bizon	2016-08-18	1	-5/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Fix build artifacts in fixtures in development env	Grzegorz Bizon	2016-08-18	1	-24/+30
\| \| \| \| \| \|
\| \| * \| \| \|	Fix build logs in development environment fixtures	Grzegorz Bizon	2016-08-18	1	-5/+9
\| \| \| \| \| \|
\| \| * \| \| \|	Refactor pipeline fixtures for dev env a little	Grzegorz Bizon	2016-08-18	1	-15/+20
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'x-bit' into 'master'	Robert Speicher	2016-08-19	4	-0/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop +x bit from .js and .css files See merge request !5885
\| \| * \| \| \| \|	drop execute bit	Elan Ruusamäe	2016-08-19	4	-0/+0
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	originally added by mistakes
\| * \| \| \| \|	Merge branch 'issue-board-label-spacing' into 'master'	Jacob Schatz	2016-08-19	1	-0/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increased vertical alignment of labels for issues in lists ## What does this MR do? Increases the vertical alignment between labels on issues in issue boards lists. ## Screenshots (if relevant) ![Screen_Shot_2016-08-19_at_16.05.31](/uploads/4edc0fa520d1a0bf692d42d5f99ce4d7/Screen_Shot_2016-08-19_at_16.05.31.png) See merge request !5902
\| \| * \| \| \| \|	Increased vertical alignment of labels for issues in lists	Phil Hughes	2016-08-19	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'issue-boards-keyboard-shortcuts' into 'master'	Jacob Schatz	2016-08-19	2	-0/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed keyboard shortcuts not working on issue boards ## What does this MR do? Fixes keyboard shortcuts not working on issue boards page. ## What are the relevant issue numbers? Closes #21071 See merge request !5890
\| \| * \| \| \| \| \|	Fixed keyboard shortcuts not working on issue boardsissue-boards-keyboard-shortcuts	Phil Hughes	2016-08-19	2	-0/+15
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #21071
\| * \| \| \| \| \|	Merge branch 'dz-test-required' into 'master'	Robert Speicher	2016-08-19	1	-1/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test requirement for new files [ci skip] See merge request !5813
\| \| * \| \| \| \| \|	Update contribution acceptance criteria with tests requirementsdz-test-required	Dmitriy Zaporozhets	2016-08-19	1	-3/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add test requirement for new files	Dmitriy Zaporozhets	2016-08-15	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'issue-boards-tooltip-hide' into 'master'	Jacob Schatz	2016-08-19	4	-14/+22
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards tooltip hide ## What does this MR do? - Hides & disables tooltips when dragging issues or lists - Fixes bug where cursor wouldn't change when dragging. See merge request !5889
\| \| * \| \| \| \| \| \|	Hides tooltip when draggingissue-boards-tooltip-hide	Phil Hughes	2016-08-19	3	-13/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with cursor not changing when dragging
\| \| * \| \| \| \| \| \|	Hides tooltips when dragging issues	Phil Hughes	2016-08-19	3	-7/+13
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master'	Douwe Maan	2016-08-19	5	-45/+69
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render coverage badge using latest successful pipeline ## What does this MR do? This MR make test coverage badge to report value for the latest successful pipeline, instead of the latest one, regardless the status. Latest pipeline is often running, which makes coverage report inaccurate. Latest pipeline can be also the failed one, which may mean that not all stages got processed, therefore coverage report can be inaccurate as well. This also improves coverage badge performance because it is not necessary to touch repository to get recent SHA on the branch. ## Why was this MR needed? See #21013 ## What are the relevant issue numbers? Closes #21013 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [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) See merge request !5862
\| \| * \| \| \| \| \| \|	Update coverage report badge feature testsfix/improve-test-coverage-badge-pipelines	Grzegorz Bizon	2016-08-18	1	-16/+25
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add Changelog entry for coverage badge improvements	Grzegorz Bizon	2016-08-18	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Update documentation for test coverage report badge	Grzegorz Bizon	2016-08-18	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Render coverage badge for latest successful pipeline	Grzegorz Bizon	2016-08-18	2	-29/+41
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'pipelines-ui-updates' into 'master'	Jacob Schatz	2016-08-19	5	-20/+20
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipelines ui updates #### What does this MR do? * Fixes hover color width on build list * Fixes alignment of status icon on commits page * Add play icon SVG #### Why was this MR needed? Small UI bugs with recent MRs ![Screen_Shot_2016-08-17_at_5.54.32_PM](/uploads/a5f1a38eac332865b17d8d74eeaa5142/Screen_Shot_2016-08-17_at_5.54.32_PM.png) ![Screen_Shot_2016-08-17_at_5.56.43_PM](/uploads/90608eee3e83dbe14244ff2be5a8867e/Screen_Shot_2016-08-17_at_5.56.43_PM.png) ![Screen_Shot_2016-08-18_at_9.18.37_AM](/uploads/9c1265fc3efa7b6084e2368d3fe458cd/Screen_Shot_2016-08-18_at_9.18.37_AM.png) See merge request !5856
\| \| * \| \| \| \| \| \|	Add play icon SVG	Annabel Dunstone	2016-08-19	3	-5/+13
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Have hover color of builds span full width	Annabel Dunstone	2016-08-19	1	-1/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix alignment of icon on commits page	Annabel Dunstone	2016-08-19	1	-14/+3
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'cs-fix-image-size-in-blob' into 'master'	Jacob Schatz	2016-08-19	1	-2/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix small image previews in the file viewer. ## What does this MR do? Fixes image previews being smaller than they should be. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Images were hard to view in the files view because they were limited to 50% of the file viewer's width. ## What are the relevant issue numbers? Mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/20505#note_13670085 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-08_at_10.35.40_AM](/uploads/69d885d1c8bb6296f5ac61aab4a4bf91/Screen_Shot_2016-08-08_at_10.35.40_AM.png) After: ![Screen_Shot_2016-08-08_at_10.35.50_AM](/uploads/b78ed41a781228d9f170ed559a1fda25/Screen_Shot_2016-08-08_at_10.35.50_AM.png) cc: @rymai See merge request !5721
\| \| * \| \| \| \| \| \|	Decrease max-width for image previews to 80%.cs-fix-image-size-in-blob	Connor Shea	2016-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix small image previews in the file viewer.	Connor Shea	2016-08-08	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See also https://gitlab.com/gitlab-org/gitlab-ce/issues/20505#note_13670085
\| * \| \| \| \| \| \| \|	Merge branch 'issue-boards-nav' into 'master'	Jacob Schatz	2016-08-19	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add boards controller to issue nav item #### What does this MR do? Adds active state to top level nav Before: ![Screen_Shot_2016-08-18_at_7.56.56_PM](/uploads/c5db0e9e077f0970b6b7b7d8d7a08147/Screen_Shot_2016-08-18_at_7.56.56_PM.png) After: ![Screen_Shot_2016-08-18_at_7.56.10_PM](/uploads/6b46e6f093c02fb44e25cf6952638a5b/Screen_Shot_2016-08-18_at_7.56.10_PM.png) See merge request !5883
\| \| * \| \| \| \| \| \| \|	Add boards controller to issue nav itemissue-boards-nav	Annabel Dunstone	2016-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'mr-title' into 'master'	Jacob Schatz	2016-08-19	1	-0/+7
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add space under MR title ## What does this MR do? Adds space underneath MR title because right now it's impossible to tell where the title ends and the first header of the MR body begins. Before: ![Screen_Shot_2016-08-18_at_1.43.05_PM](/uploads/4e07892036b1d90217fdecbed31a9494/Screen_Shot_2016-08-18_at_1.43.05_PM.png) After: ![Screen_Shot_2016-08-18_at_1.42.22_PM](/uploads/1341d4d7c5bd0db21233f6ebb961bafc/Screen_Shot_2016-08-18_at_1.42.22_PM.png) Note: We need to change our template to have the md headers `####` instead of `##`. Once that's been done it will look like this: ![Screen_Shot_2016-08-18_at_1.46.46_PM](/uploads/e30d432551debc15ec210e76dfcd3451/Screen_Shot_2016-08-18_at_1.46.46_PM.png) See merge request !5875