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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed issue with returning ref in commits JSONasync-refs-dropdown	Phil Hughes	2016-06-20	3	-4/+24
\| \| \| \|	Added tests to project controller
*	Fixed Ruby to use exclude	Phil Hughes	2016-06-18	2	-2/+2
\|
*	Correctly adds commit ID into dropdown	Phil Hughes	2016-06-18	5	-70/+10
\| \| \| \| \|	Removes un-used method Fixes other Ruby issues
*	Pulls back tags if any exist	Phil Hughes	2016-06-18	1	-2/+6
\|
*	Escapes branch names before appending to dom	Phil Hughes	2016-06-18	2	-2/+2
\|
*	Tests fix for ref switcher	Phil Hughes	2016-06-18	7	-16/+37
\|
*	Refs dropdown is now loaded async	Phil Hughes	2016-06-18	7	-11/+73
\|
*	Merge branch 'star-fork-mobile' into 'master'	Jacob Schatz	2016-06-18	3	-1/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Display Star and Fork on mobile, fix #18537.star-fork-mobile	Connor Shea	2016-06-16	3	-1/+15
\| \|
* \|	Merge branch 'milestones-show-mrs' into 'master'	Jacob Schatz	2016-06-18	2	-0/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Add merge request data to the progress information on Milestones pages.milestones-show-mrs	Connor Shea	2016-06-16	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13980.
* \| \|	Merge branch '18762-feedback-btn' into 'master'	Jacob Schatz	2016-06-18	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Fix margin & padding on activity btn18762-feedback-btn	Annabel Dunstone	2016-06-17	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch 'comment-form-button-spacing' into 'master'	Jacob Schatz	2016-06-18	3	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment of buttons in note forms ## What does this MR do? Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group. ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_11.43.33](/uploads/5d9037a48ff6179fc906bdf0c6d5ff47/Screen_Shot_2016-06-17_at_11.43.33.png) ![Screen_Shot_2016-06-17_at_11.43.43](/uploads/8b130a25e8f73e79578d38f5f7aff4fb/Screen_Shot_2016-06-17_at_11.43.43.png) See merge request !4740
\| * \| \| \|	Fixed alignment of buttons in note formscomment-form-button-spacing	Phil Hughes	2016-06-17	3	-4/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dz-organize-admin-settings' into 'master'	Jacob Schatz	2016-06-18	3	-64/+70
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin->runners tab as subnav of overview tab cc @annabeldunstone See merge request !4716
\| * \| \| \| \|	Move admin->runners tab as subnav of overview tabdz-organize-admin-settings	Dmitriy Zaporozhets	2016-06-16	3	-64/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'tags-edit-tooltip-placement' into 'master'	Jacob Schatz	2016-06-18	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed tooltip placement on edit tags button ## What does this MR do? Moves the placement of the tooltip to the body so not to affect the movement of the button. ## Screenshots (if relevant) Old: ![tooltip-old](/uploads/9ecb9bb919578881994698cd8b1d1826/tooltip-old.gif) New: ![tooltip-new](/uploads/66f90cf95c2ee4001bfa3c65b9de8c05/tooltip-new.gif) See merge request !4737
\| * \| \| \| \| \|	Fixed tooltip placement on edit tags buttontags-edit-tooltip-placement	Phil Hughes	2016-06-17	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'branch-buttons-size' into 'master'	Jacob Schatz	2016-06-18	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed size of buttons in branches list ## What does this MR do? The buttons on the branch list were using `btn-xs` this MR removes that so the buttons are a normal size to match https://gitlab.com/gitlab-org/gitlab-ce/tags ## What are the relevant issue numbers? #18677 ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_10.38.31](/uploads/19fc173e3f549a84bb14517613403792/Screen_Shot_2016-06-17_at_10.38.31.png) See merge request !4735
\| * \| \| \| \| \|	Fixed size of buttons in branches listbranch-buttons-size	Phil Hughes	2016-06-17	1	-3/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18677
* \| \| \| \| \|	Merge branch 'last-push-vertical-alignment' into 'master'	Jacob Schatz	2016-06-18	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aligns create merge request button vertically ## What does this MR do? Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4644#note_12507178 I have vertically aligned the button correctly. ## Screenshots (if relevant) Here is my awesome screenshot to show it is centered vertically ![Screen_Shot_2016-06-17_at_10.17.19](/uploads/e7bf5bcc5b254ed4db376c16460d79a5/Screen_Shot_2016-06-17_at_10.17.19.png) See merge request !4733
\| * \| \| \| \| \|	Aligns create merge request button verticallylast-push-vertical-alignment	Phil Hughes	2016-06-17	1	-1/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '18714_bulk_assign_labels_icon' into 'master'	Jacob Schatz	2016-06-18	3	-1/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \|	Click until item is unmarked18714_bulk_assign_labels_icon	Alfredo Sumaran	2016-06-16	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix spelling error on filename	Alfredo Sumaran	2016-06-16	1	-0/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixes icon state when selecting issues that have the same labels assigned	Alfredo Sumaran	2016-06-16	3	-1/+30
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '18707-label-tooltips-dont-dissapear-firefox' into 'master'	Jacob Schatz	2016-06-18	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide tooltip manually ## What does this MR do? Fixes an issue with tooltips not dissapearing on Firefox after toggling label priority ## What are the relevant issue numbers? Closes #18707 ## Screenshots (if relevant) Test on Firefox ![label-firefox](/uploads/09ed05f81b9861d666e5d9ad805fb501/label-firefox.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 - [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 !4715
\| * \| \| \| \| \| \|	Hide tooltip manually18707-label-tooltips-dont-dissapear-firefox	Alfredo Sumaran	2016-06-16	1	-0/+5
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the not dissapearing tooltip issue on Firefox after toggling label priority
* \| \| \| \| \| \|	Merge branch '18819-wiki-link-filter-exception' into 'master' 18824-improve-list-of-repositories-during-import-from-github	Stan Hu	2016-06-18	2	-1/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug in `WikiLinkFilter`. Closes #18819 - [ ] #18819 Wiki link filter exception - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/6d169d36cabda783116bcb8e2e6f73254566a670/builds) passes - [ ] Wait for merge - [ ] Pick into 8.9 See merge request !4775
\| * \| \| \| \| \| \|	Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exception	Timothy Andrew	2016-06-18	2	-1/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. An exception would be raised if the filter was called with an invalid URI. Mainly because we weren't catching the `Addressable` exception. 2. This commit fixes it and adds a spec for the filter.
* \| \| \| \| \| \| \|	Merge branch 'ci-scala-example' into 'master'	Achilleas Pipinellis	2016-06-18	2	-1/+49
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci scala example ## What does this MR do? Add a scala CI example. ## Why was this MR needed? Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2984 See merge request !4774
\| * \| \| \| \| \| \|	Merge branch 'master' into ci-scala-example	Achilleas Pipinellis	2016-06-18	2714	-22458/+103393
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue_12758' into 'master'	Douwe Maan	2016-06-17	34	-249/+643
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement custom notification level options ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png) ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png) part of #12758 See merge request !4389
\| * \| \| \| \| \| \| \|	Small frontend code fixes and restore 8a2d88f commit	Felipe Artur	2016-06-17	2	-7/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge master into issue_12758issue_12758	Felipe Artur	2016-06-17	208	-1565/+11605
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Allow users to set custom notifications in projects they don't own and ↵	Felipe Artur	2016-06-17	12	-59/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	several fixes to code
\| * \| \| \| \| \| \| \| \|	Fixed bug with label clicking in modal not working	Phil Hughes	2016-06-17	1	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixed bug with clicking custom again not opening modal	Phil Hughes	2016-06-17	2	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Description for custom in dropdown	Phil Hughes	2016-06-17	1	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixed alignment of notification dropdown menu	Phil Hughes	2016-06-17	3	-4/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Re-use notifications dropdown/modal for user profile	Felipe Artur	2016-06-17	27	-263/+418
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Re-use notifications dropdown on user profile	Felipe Artur	2016-06-16	25	-264/+361
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Update migration to match current schema version	Felipe Artur	2016-06-14	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Refactor custom notifications controller code and add specs	Felipe Artur	2016-06-14	7	-20/+65
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Remove schema from branch history	Felipe Artur	2016-06-13	11	-39/+170
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Add notification settings documentation and update screenshot	Felipe Artur	2016-06-13	3	-2/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Expose notification setting events in API	Felipe Artur	2016-06-13	2	-6/+26
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Improve notification settings event keys and add some specs	Felipe Artur	2016-06-13	3	-50/+102
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Implement custom notification level options	Felipe Artur	2016-06-13	3	-23/+69
\| \| \| \| \| \| \| \| \| \| \|