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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removed puts code :see_no_evil:code-blocks-vue-pre	Phil Hughes	2016-10-04	1	-1/+0
\|
*	Adds v-pre to code blocks in comments	Phil Hughes	2016-10-04	4	-3/+17
\| \| \| \|	Closes #22911
*	Merge branch 'issue_22446' into 'master'	Sean McGivern	2016-10-04	4	-0/+65
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug when trying to cache closed issues from external issue trackers fixes #22446 See merge request !6619
\| *	Merge branch 'master' into issue_22446	Sean McGivern	2016-10-04	10	-26/+53
\| \|\
\| * \|	Fix bug when trying to cache closed issues from external issue trackersissue_22446	Felipe Artur	2016-10-03	4	-0/+65
\| \| \|
* \| \|	Merge branch 'cs-upgrade-acts-as-taggable-on' into 'master'	Dmitriy Zaporozhets	2016-10-04	2	-5/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0. ## What does this MR do? Upgrades the acts-as-taggable-on gem from 3.5.0 to 4.0.0. Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08 ## Are there points in the code the reviewer needs to double check? That this works without the migrations, I don't believe the upgrade from 3.5.0 to 4.0.0 requires any migrations since [UPGRADING.md hasn't been updated since 3.5.0 was released](https://github.com/mbleigh/acts-as-taggable-on/blob/master/UPGRADING.md). It's kind of unclear, unfortunately. ## What are the relevant issue numbers? Fixes #22082. Working toward Rails 5: #14286. cc: @dzaporozhets See merge request !6660
\| * \| \|	Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0.cs-upgrade-acts-as-taggable-on	Connor Shea	2016-10-03	2	-5/+5
\| \|/ / \| \| \| \| \| \| \| \| \|	Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08
* \| \|	Merge branch 'cleanup-mentionable-methods-arguments' into 'master'	Douwe Maan	2016-10-04	6	-27/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify Mentionable concern instance methods ## What does this MR do? Simplify arguments received by the instance methods on the concern so in the closer future will be easy to understand and change ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) ## What are the relevant issue numbers? See merge request !6596
\| * \| \|	Use SELECT 1, instead SELECT COUNT(*) to ask for notes existencycleanup-mentionable-methods-arguments	Paco Guzman	2016-10-04	1	-1/+1
\| \| \| \|
\| * \| \|	Simplify Mentionable concern instance methods	Paco Guzman	2016-10-04	5	-26/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We remove some arguments that are rarely used or used just to simplify setups on specs. Modified Mentionable#create_new_cross_references method we don’t need to calculate previous references to avoid the duplication because we do that at database level when creating references extracted from the current entity state. MergeRequests won’t create cross_references for commits that are included so we change a spec to use a different merge request to make references to commits to other branches
* \| \| \|	Merge branch 'rc-improve-members-destroy-service' into 'master'	Robert Speicher	2016-10-04	11	-69/+140
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve `Members::DestroyService` Part of #21979. See merge request !6267
\| * \| \| \|	Remove useless code now that Member#add_user handles itrc-improve-members-destroy-service	Rémy Coutable	2016-10-03	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Invert method's naming	Rémy Coutable	2016-10-03	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Fix a few things after the initial improvment to Members::DestroyService	Rémy Coutable	2016-10-03	9	-15/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Improve Members::DestroyService	Rémy Coutable	2016-10-03	8	-67/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'append-issue-template' into 'master'	Fatih Acet	2016-10-04	4	-16/+47
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Append issue template to existing description ## What does this MR do? When selecting an issue template after entering a description, append the template and leave the original content intact. ## Are there points in the code the reviewer needs to double check? Not that I'm aware of. ## Why was this MR needed? The issue template shouldn't override the issue content without warning. ## Screenshots ![](https://i.imgur.com/E16X2tc.gif) ## 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 - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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` - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21733 See merge request !6149
\| * \| \| \| \|	Combine requestFileSuccess arguments into `opts`	Joseph Frazier	2016-10-03	2	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6149#note_14830172
\| * \| \| \| \|	Append issue template to existing description	Joseph Frazier	2016-10-03	4	-13/+41
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21733 Add two newlines before the template if the existing description isn't empty. This makes it easier to see where the template begins. Don't append the template when "Reset template" is selected, of course. Don't append template if it equals the existing description. This makes it so that selecting a template twice doesn't duplicate it.
* \| \| \| \|	Merge branch 'todo-issue-due-date' into 'master'	Robert Speicher	2016-10-04	4	-1/+29
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Todo issue due date ## What does this MR do? Adds the text 'Due today' or 'Due [DATE]' next to issues in todos. This does not add anyway to filter by due date - little steps. ## What are the relevant issue numbers? #18218 See merge request !6351
\| * \| \| \|	Removed try method call on due datetodo-issue-due-date	Phil Hughes	2016-10-03	1	-3/+11
\| \| \| \| \|
\| * \| \| \|	Moved middot into helper method	Phil Hughes	2016-10-03	2	-2/+3
\| \| \| \| \|
\| * \| \| \|	Moved todo due date to helper method	Phil Hughes	2016-10-03	2	-8/+7
\| \| \| \| \|
\| * \| \| \|	Moved todo due date text into helper method	Phil Hughes	2016-10-03	2	-5/+7
\| \| \| \| \|
\| * \| \| \|	Uses variable	Phil Hughes	2016-10-03	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added red text if overdue
\| * \| \| \|	CHANGELOG item	Phil Hughes	2016-10-03	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Added test for due date	Phil Hughes	2016-10-03	1	-1/+7
\| \| \| \| \|
\| * \| \| \|	Added issue due date to todos row	Phil Hughes	2016-10-03	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of #18218
* \| \| \| \|	Merge branch 'zj-grape-sessions' into 'master'	Robert Speicher	2016-10-04	1	-12/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GrapeDSL for Namespace endpoint No changelog item as it doesn't change behaviour Cherry-picked from !6330 See merge request !6632
\| * \| \| \| \|	GrapeDSL for Namespace endpointzj-grape-sessions	Z.J. van de Weg	2016-10-04	1	-12/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/import-service-issues' into 'master'	Robert Speicher	2016-10-04	3	-0/+19
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issues importing services via Import/Export Prevents errors when initialising services that do not have any properties set yet - case that could happen when importing projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22891 See merge request !6667
\| * \| \| \| \|	Fix issues importing services via Import/Export	James Lopez	2016-10-04	3	-0/+19
\| \|/ / / /
* \| \| \| \|	Merge branch '22805-container-registry-status' into 'master'	Robert Speicher	2016-10-04	2	-0/+6
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Container Registry on/off status to admin area ## What are the relevant issue numbers? Closes #22805 See merge request !6638
\| * \| \| \|	Add Container Registry on/off status to admin area	the-undefined	2016-10-03	2	-0/+6
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display the on/off icon under the "Features" section of the admin area for the Container Registry. Closes !22805
* \| \| \|	Merge branch 'remove-hex-shorties' into 'master'	Stan Hu	2016-10-04	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove SCSS rules for short hex chars. ## What does this MR do? Remove CSS hex shorthands linter ## Are there points in the code the reviewer needs to double check? That I did it right. ## Why was this MR needed? To remove SCSS linter for hex shorthands ## Screenshots (if relevant) ## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22920 cc @connorshea See merge request !6663
\| * \| \| \|	Remove SCSS rules for short hex chars.	Jacob Schatz	2016-10-03	2	-2/+2
\|/ / / /
* \| \| \|	Merge branch ↵	Jacob Schatz	2016-10-03	3	-3/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22006-change-build-wording-to-pipeline-in-mr-block-add-pipeline-id' into 'master' Changed mr widget build status to pipeline status ## What does this MR do? Changed mr widget build status to pipeline status with pipeline id, with a link to the pipeline. ## Are there points in the code the reviewer needs to double check? Do we want the link to the pipeline? /cc @dimitrieh ## Screenshots (if relevant) ![Screen_Shot_2016-09-14_at_02.42.23](/uploads/94a860361ab70eccf966e519764c6ec5/Screen_Shot_2016-09-14_at_02.42.23.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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) ## What are the relevant issue numbers? Closes #22006 See merge request !6335
\| * \| \| \|	Changed mr widget build status to pipeline status with pipeline id, with a ↵22006-change-build-wording-to-pipeline-in-mr-block-add-pipeline-id	Luke Bennett	2016-09-22	3	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	link to the pipeline View details now links to pipelines tab Added changelog entry
* \| \| \| \|	Merge branch '22022-copy-to-clipboard-tooltip' into 'master'	Fatih Acet	2016-10-03	2	-9/+10
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tooltip text when Copy to cliboard is clicked ## What does this MR do? Fixes #22022 to change tooltip text to "Copied!" when the "Copy to clipboard" button is clicked. ## Are there points in the code the reviewer needs to double check? Line 29 in app/assets/javascripts/copy_to_clipboard.js ## Why was this MR needed? There was a regression that prevents tooltip change on button click for Copy to clipboard. ## 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) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Closes #22022 See merge request !6294
\| * \| \| \|	Fix tooltip for Copy to clipboard button.	Luke Howell	2016-09-29	2	-9/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Copy to clipboard" tooltip to say "Copied!" when clipboard button is clicked. Closes #22022
* \| \| \| \|	Merge branch 'rs-string-conversion-in-interpolation' into 'master'	Rémy Coutable	2016-10-03	11	-14/+13
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Lint/StringConversionInInterpolation cop and autocorrect offenses See merge request !6654
\| * \| \| \|	Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolation	Robert Speicher	2016-10-03	11	-14/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2016-10-03	10	-24/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed Slack service user referencing from full name to username Closes #22737 See merge request !6624
\| * \ \ \ \	Merge branch 'master' of https://gitlab.com/secustor/gitlab-ce.git	secustor	2016-10-03	0	-0/+0
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'master' of https://gitlab.com/secustor/gitlab-ce.git	sebastian.poxhofer	2016-10-02	0	-0/+0
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	adapted tests for usage of the username	secustor	2016-10-01	5	-20/+20
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Changed Slack service user referencing from full name to username	secustor	2016-09-30	5	-4/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	adapted tests for usage of the username	secustor	2016-10-02	5	-20/+20
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Changed Slack service user referencing from full name to username	secustor	2016-10-02	5	-4/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Changed Slack service user referencing from full name to username	secustor	2016-10-03	10	-24/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'add-email-subject-suffix' into 'master'	Rémy Coutable	2016-10-03	9	-11/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add configurable email subject suffix ## Why was this MR needed? I noticed that there is a commit 44ab156e 3 years ago which removes email subject prefix actually we do need an special part of the email subject which makes the email subject easy to identify we just need to make it configurable rather than remove it. See merge request !6172