- 21 Jun, 2016 22 commits
-
-
Dmitriy Zaporozhets authored
-
Yorick Peterse authored
Cache Participable#participants in instance variable See merge request !4803
-
Yorick Peterse authored
Remove calls to Rugged::BranchCollection#each from extracts_path before_action See merge request !4802
-
Stan Hu authored
Fallback to group's owners/masters when a project has none for the "access requested email" ## What does this MR do? From b31c5052: Fallback to group's owners/masters when a project has none A project in a group can have no explicit owners/masters, in that case we fallbacks to the group's owners/masters. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because of #18757. ## What are the relevant issue numbers? Fixes #18757. ## Does this MR meet the acceptance criteria? - [x] No need for CHANGELOG. - [x] No need for documentation. - [x] No API support added. - [x] 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 !4791
-
Jacob Schatz authored
Make lists on notes to look the same in preview mode and published ## What does this MR do? Makes list styles on notes to be the same. Previously the styles weren't shared. ## Screenshots (if relevant) **Previous** ![label-style-old](/uploads/f121fe99e9255cf0d75185185f51fec2/label-style-old.gif) **After** ![label-style](/uploads/23febf41aaf8796d250a662fa6dc15d2/label-style.gif) See merge request !4765
-
Dmitriy Zaporozhets authored
Align avatar and commit content within commit row ## What does this MR do? Aligns the user avatar on `Compare` ## What are the relevant issue numbers? Closes #18787 ## Screenshots (if relevant) <img src="/uploads/9525a599989f6a9faca54d9f9c62f755/Screen_Shot_2016-06-20_at_11.25.08_AM.png" width="800px"> <img src="/uploads/6c96ed629f377d69745548309006a520/Screen_Shot_2016-06-20_at_11.25.19_AM.png" width="800px"> See merge request !4764
-
Achilleas Pipinellis authored
Document access request to project & group ## What does this MR do? Adds documentation that was missing from !3798. ## Are there points in the code the reviewer needs to double check? I've taken the opportunity to update the images in the "Project users" documentation page, I can remove the commit if it's not welcome! ## What are the relevant issue numbers? Closes #18584. ## Does this MR meet the acceptance criteria? - [ ] Tests - [ ] 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 @DouweM See merge request !4685
-
Jacob Schatz authored
Stop edit note up key shortcut conflicting with native shortcuts ## What does this MR do? Restricts edit note shortcut to only the `up` button, if modifier keys are used it will not fire the shortcut. ## Are there points in the code the reviewer needs to double check? Ney. ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18113. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] 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 !4761
-
Jacob Schatz authored
Resolve "Tooltip for pinning sidebar" ## What does this MR do? Adds tooltip to show whether sidebar is pinned/unpinned ## What are the relevant issue numbers? Closes #18743 ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_12.14.25_PM](/uploads/162f52084a770012cdc621122acd6c6c/Screen_Shot_2016-06-17_at_12.14.25_PM.png) ![Screen_Shot_2016-06-17_at_12.14.35_PM](/uploads/d9296720aeada972441f48d9a3d2f7f8/Screen_Shot_2016-06-17_at_12.14.35_PM.png) See merge request !4759
-
Jacob Schatz authored
Documented the up key shortcut ## What does this MR do? Documents the `up` key edit note shortcut in the `/help/_shortcuts.html.haml` help pane and the `/doc/workflow/shortcuts.png` screenshot. ## Are there points in the code the reviewer needs to double check? The issue and MR shortcuts should be merged, they're the same? Shall I open an issue or include here? This panel also need to be a little more responsive. Shall I open an issue or include here? Additionally, I have some conflicts regarding the screenshot. This screenshot also needs to update for !4570. ## Why was this MR needed? Everyone should know about this awesome shortcut. ## What are the relevant issue numbers? Closes #18114. ## Screenshots (if relevant) View the [updated screenshot](https://gitlab.com/gitlab-org/gitlab-ce/blob/e7221ad66efeb0f7d263ead7ed523d194243fb09/doc/workflow/shortcuts.png) ## 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) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] 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 !4758
-
Jacob Schatz authored
Corrected top search area css media query param ## What does this MR do? Corrects top search area css media query so it switches styles at the correct screen size. ## Are there points in the code the reviewer needs to double check? It's a regression so likely ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18490. (This stops the search bar dropping into its own row until it needs to be 100% column stacked anyway) ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_17.45.38](/uploads/2278e2cdb1c2de14fc098e30fd5328d8/Screen_Shot_2016-06-17_at_17.45.38.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] 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 !4756
-
Yorick Peterse authored
Remove explicit Gitlab::Metrics.action assignments, are already automatic. See merge request !4731
-
Jacob Schatz authored
Fixed merge on success widget buttons on mobile ## What does this MR do? Fixes 'merge on success' widget buttons on mobile as they were stacked with 100% width before when it is a button group with a small dropdown button. ## Are there points in the code the reviewer needs to double check? Ney ## Why was this MR needed? mobile UX ## What are the relevant issue numbers? Closes #18610. ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_03.09.36](/uploads/b662e1b7ad683cd89f1233a859caccb2/Screen_Shot_2016-06-17_at_03.09.36.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] 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 !4726
-
Achilleas Pipinellis authored
Document email on push service Addresses https://gitlab.com/gitlab-org/gitlab-ee/issues/80 See merge request !4698
-
Jacob Schatz authored
Fix regressions in the design of the project statistics bar. ## What does this MR do? Improves the design of the empty Changelog, Contribution guide, and License items in the project statistics bar. ## Are there points in the code the reviewer needs to double check? Don't think so, maybe that the `project-stats` class isn't used anywhere else (a grep suggests it's not) ## Why was this MR needed? Because the empty state of the repository didn't look as good anymore. ## What are the relevant issue numbers? #18734 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-16_at_12.15.22_PM](/uploads/a5c27d696af186346a2298071c90ba2d/Screen_Shot_2016-06-16_at_12.15.22_PM.png) After: ![Screen_Shot_2016-06-16_at_12.59.38_PM](/uploads/8719d3ee507affd4ce7ea479a5422908/Screen_Shot_2016-06-16_at_12.59.38_PM.png) See merge request !4717
-
Jacob Schatz authored
Fixes font weight of commit id on view file button ## What does this MR do? Changes the weight to normal. With the new commit UI - this had turned bold and didn't match the designs. Should it also be our normal font family? According to designs it is - but everywhere else there is a commit ID it has the monospace font. ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_17.25.33](/uploads/bb76d576c10be65172d5f4e9790ca766/Screen_Shot_2016-06-16_at_17.25.33.png) See merge request !4713
-
Jacob Schatz authored
Add borders to images in issues, MRs, and Help. ## What does this MR do? Adds a gray border around images in Issues, MRs, and Help pages. ## Are there points in the code the reviewer needs to double check? That this doesn't effect other elements or pages that it shouldn't. ## Why was this MR needed? It was hard to differentiate between the actual interface and screenshots of it. ## What are the relevant issue numbers? Fixes #18578 ## Screenshots (if relevant) ### Issues/MRs Before: ![Screen_Shot_2016-06-14_at_12.22.08_PM](/uploads/00a242a5b4a09b5308f02e6e498862a8/Screen_Shot_2016-06-14_at_12.22.08_PM.png) After: ![Screen_Shot_2016-06-14_at_12.22.30_PM](/uploads/8fc9fc1c561d788b050e48373449771b/Screen_Shot_2016-06-14_at_12.22.30_PM.png) ![Screen_Shot_2016-06-14_at_12.22.39_PM](/uploads/36c91b2f2ce1eeb77f1646415baea14d/Screen_Shot_2016-06-14_at_12.22.39_PM.png) ### Help Before: ![Screen_Shot_2016-06-14_at_11.58.54_AM](/uploads/7620491ca338064b872efb538b0bf4f3/Screen_Shot_2016-06-14_at_11.58.54_AM.png) After: ![Screen_Shot_2016-06-14_at_11.58.57_AM](/uploads/d9fcfcac0f70dde4e69ff4263e369f65/Screen_Shot_2016-06-14_at_11.58.57_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [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 !4655
-
Jacob Schatz authored
Hides award emoji & access level on system notes ## What does this MR do? Hides award emoji & access level on system notes as they aren't applicable to them notes. ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png) See merge request !4629
-
Jacob Schatz authored
Fixed issue with notification dropdown not updating active ## What does this MR do? This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success. ## What are the relevant issue numbers? Closes #18480 ## Screenshots (if relevant) ![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif) See merge request !4615
-
Jacob Schatz authored
Refs dropdown is now loaded async ## What does this MR do? The refs dropdown is loaded async so not to block the page. ## What are the relevant issue numbers? Part of #18202 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png) See merge request !4508
-
Rémy Coutable authored
Allow to fetch LFS from CI ## What does this MR do? This adds support for fetching LFS object from CI jobs (mostly it's made for supporting GitLab CI). ## What is left? - [x] Write tests covering a new authorization mechanism cc @grzesiek @marin See merge request !4465
-
Rémy Coutable authored
Set missing stages on ci builds to 'test' to avoid regressions in the pipelines view ## What does this MR do? Sets a default stage on old `ci_builds`. ## Are there points in the code the reviewer needs to double check? Is the migration acceptable for online execution? ## Why was this MR needed? Old `ci_builds`with no stages cause a regression on the pipelines index view. ## What are the relevant issue numbers? #17949 Blocked by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4680 See merge request !4381
-
- 20 Jun, 2016 16 commits
-
-
Yorick Peterse authored
Add notification_settings:events to schema See merge request !4800
-
Jacob Schatz authored
Display Star and Fork on mobile, fix #18537. ## What does this MR do? Displays the Star and Fork buttons on mobile devices. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? I wanted to star and/or fork projects while on my phone, I couldn't do that before. ## What are the relevant issue numbers? #18537 ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png) cc: @jschatz1 See merge request !4714
-
Jacob Schatz authored
Toggle whitespace button for compare page ## What does this MR do? Adds whitespace button to compare branches page. ## Are there points in the code the reviewer needs to double check? Ruby code. ## Why was this MR needed? Compare branches UX ## What are the relevant issue numbers? Closes #17881. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.39.48](/uploads/8995a7bc8bea7fa3ff19446ebe49fb88/Screen_Shot_2016-06-09_at_18.39.48.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] 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 !4569
-
Jacob Schatz authored
Fixes item icon state when for issues that have the same labels assigned ## What does this MR do? Previously if all issues had the same labels the dropdown was showing the labels with indeterminate stated which is wrong. This MR fixes that and shows the correct state. ## What are the relevant issue numbers? Fixes #18714 ## Screenshots (if relevant) **Before** ![label-before](/uploads/c65aa051e773dfea898a0d19767d6ade/label-before.gif) **After** ![label](/uploads/73fd657d104d1081e189e0a9547d483b/label.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4721
-
Jacob Schatz authored
Set path for pinned nav cookie ## What does this MR do? Sets a path for the pinned nav cookie so it will be present across page reload. Closes #18836 See merge request !4784
-
Jacob Schatz authored
Fixed placement of close button on merge requests ## What does this MR do? Fixes the order in which the MR buttons appear ## Screenshots (if relevant) ![Screen_Shot_2016-06-18_at_21.41.38](/uploads/66a88ebc287b7c21160af193ee9de54c/Screen_Shot_2016-06-18_at_21.41.38.png) ![Screen_Shot_2016-06-18_at_21.41.44](/uploads/ba8f6776d79f4eb0af7877c3c71fbb54/Screen_Shot_2016-06-18_at_21.41.44.png) See merge request !4778
-
Achilleas Pipinellis authored
Document environments and deployments ## What does this MR do? Adds an introduction to environments and deployments and tweaks the `environments` entry in `.gitlab-ci.yml` documentation. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Closes #18683. ## Screenshots (if relevant) ![image](/uploads/1e3355c543abaf7b358f3c37596b1f0b/image.png) ![image](/uploads/58a51505674bcf605039db46833a8ae6/image.png) /cc @ayufan @axil See merge request !4725
-
Jacob Schatz authored
Move part of admin area navigation from tabs into settings dropdown Partly fix https://gitlab.com/gitlab-org/gitlab-ce/issues/18799 See merge request !4796
-
Robert Speicher authored
Avoid autoload issue such as 'Mail::Parsers::AddressStruct' This is mostly a shot in the dark but at least it shouldn't break anything. Fixes #18810. See merge request !4793
-
Yorick Peterse authored
Remove Duplicated keys adding UNIQUE index to fingerprint See merge request !4787
-
Rémy Coutable authored
Fixed a couple of errors on import/export spotted in production Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829 A couple of tiny bugs spotted after deploying in prod See merge request !4782
-
Robert Speicher authored
Fix RangeError exceptions when referring to issues or merge requests outside of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777 See merge request !4777
-
Achilleas Pipinellis authored
Grammar tweaks ## What does this MR do? * Updates grammar in recent CI documentation. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Because grammar. ## What are the relevant issue numbers? Needed because of !4200 and !4201. ## Screenshots (if relevant) See merge request !4772
-
Jacob Schatz authored
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
-
Jacob Schatz authored
New Project page improvements for mobile ## What does this MR do? Redesigns the "Project path" fields on the New Project page. ## Are there points in the code the reviewer needs to double check? Not that I know of, nothing I changed should break any other pages. ## Why was this MR needed? The new project page was unusable on mobile because the project name text field didn't have enough space. ## What are the relevant issue numbers? Fixes #18599. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-15_at_12.38.58_PM](/uploads/046a824b283e24266cabc9ea3dfb169c/Screen_Shot_2016-06-15_at_12.38.58_PM.png) After: ![Screen_Shot_2016-06-15_at_12.37.19_PM](/uploads/6d01310192965b413bfedd9c8d2129f7/Screen_Shot_2016-06-15_at_12.37.19_PM.png) ![Screen_Shot_2016-06-15_at_12.37.28_PM](/uploads/3944a0f0ab04373ec92f7cafe90872df/Screen_Shot_2016-06-15_at_12.37.28_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @jschatz1 @dzaporozhets See merge request !4687
-
Robert Speicher authored
Limit push email diff size Restrict the size of diffs in push emails to 30 lines / 150 KB (whichever is smaller), following https://gitlab.com/gitlab-org/gitlab_git/merge_requests/85. Emails on push can get very large if they contain a lot of files that sneak under the single-file limit. https://gitlab.com/gitlab-org/gitlab-ee/issues/490 See merge request !4566
-
- 18 Jun, 2016 2 commits
-
-
Robert Speicher authored
-
Jacob Schatz authored
Fix margin & padding on activity btn ## What does this MR do? Fixes alignment of activity btn ## What are the relevant issue numbers? Closes #18762 ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_9.29.06_AM](/uploads/4ab9fb33d450dda72811a5ce2570b8c7/Screen_Shot_2016-06-17_at_9.29.06_AM.png) See merge request !4750
-