Rémy Coutable 639942ef01 Merge branch 'issue_8110' into 'master' ... Allow slack service to send messages on different channels closes #8110 ## Allow slack service to send messages on different channels  ## 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 [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 !5124		2016-07-20 15:56:06 +00:00
..
ci	Fix a problem with processing a pipeline where stage only has manual actions	2016-07-20 16:42:28 +02:00
concerns	Mark builds with manual actions as skipped	2016-07-18 14:48:36 +02:00
hooks	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
members	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
network	Enable Style/SpaceAfterComma Rubocop cop	2016-06-29 15:23:44 +02:00
project_services	Refactor service settings view	2016-07-20 12:11:37 -03:00
.gitkeep
ability.rb	Fix a few nitpicks	2016-07-20 14:38:21 +02:00
abuse_report.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
appearance.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
application_setting.rb	Added setting to set new users by default as external	2016-07-07 19:21:18 +02:00
audit_event.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
award_emoji.rb	Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.	2016-06-29 14:53:09 -06:00
blob.rb	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
broadcast_message.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
commit.rb	Represent DiffRefs as proper class instead of tuple array	2016-07-06 18:50:58 -04:00
commit_range.rb	Fix comment for project argument in commit_range.rb	2016-06-20 11:12:04 -07:00
commit_status.rb	Make manual actions to work with master code	2016-07-18 14:57:24 +02:00
deploy_key.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
deploy_keys_project.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
deployment.rb	Improve manual actions code and add model, service and feature tests	2016-07-18 14:46:20 +02:00
diff_note.rb	Make DiffNote#update_position private	2016-07-07 16:13:55 -04:00
email.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
environment.rb	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
event.rb	Use a more future-proof check for Note/LegacyDiffNote	2016-07-06 10:08:42 +02:00
external_issue.rb	Merge branch 'master' into number_sign_for_external_issue_ref	2016-04-17 18:17:27 +02:00
forked_project_link.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
generic_commit_status.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
global_label.rb	Updates from last code review.	2016-03-06 23:07:19 -05:00
global_milestone.rb	Ruby fixes	2016-03-29 12:19:09 +01:00
group.rb	Dumb-down avatar presence check in avatar_url methods	2016-07-05 10:51:11 -04:00
identity.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
issue.rb	use has_many relationship with events	2016-07-01 15:34:10 +02:00
key.rb	Remove Duplicated keys add UNIQUE index to fingerprint	2016-06-20 13:29:04 +02:00
label.rb	Simplify regex for string-based multi-word label surrounded in quotes	2016-07-13 16:01:27 -03:00
label_link.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
legacy_diff_note.rb	Don't fail when a LegacyDiffNote didn't store the right diff	2016-07-15 17:32:49 -05:00
lfs_object.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
lfs_objects_project.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
member.rb	Exclude requesters from Project#members, Group#members and User#members	2016-07-01 17:44:46 +02:00
merge_request.rb	Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""	2016-07-18 10:16:56 +02:00
merge_request_diff.rb	Squashed - fix encoding issue	2016-07-19 09:59:54 +02:00
milestone.rb	use has_many relationship with events	2016-07-01 15:34:10 +02:00
namespace.rb	Refactor repository paths handling to allow multiple git mount points	2016-06-29 22:30:31 -04:00
note.rb	Fix not normalized emoji paths	2016-07-14 08:51:00 +02:00
notification_setting.rb	Exclude projects pending delete from notifications	2016-07-07 20:49:17 +01:00
oauth_access_token.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
personal_access_token.rb	Address @DouweM's feedback on !3749.	2016-04-28 22:28:36 +05:30
personal_snippet.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
project.rb	Merge branch 'ci-predefined-variables' into 'master'	2016-07-20 12:40:46 +00:00
project_group_link.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
project_import_data.rb	add missing attribute to attr_encrypted so it is fully backwards-compatible	2016-06-28 09:55:19 +02:00
project_snippet.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
project_team.rb	Exclude requesters from Project#members, Group#members and User#members	2016-07-01 17:44:46 +02:00
project_wiki.rb	Refactor repository paths handling to allow multiple git mount points	2016-06-29 22:30:31 -04:00
protected_branch.rb	Have Project#open_branches return branches that are matched by a wildcard protected branch.	2016-07-07 10:07:31 +05:30
release.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
repository.rb	Expire tags/branches repo cache before delete a repository	2016-07-20 09:31:56 +02:00
security_event.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
sent_notification.rb	Allow SentNotification#position to be set as string or hash	2016-07-11 12:21:05 -05:00
service.rb	Merge branch 'issue_8110' into 'master'	2016-07-20 15:56:06 +00:00
snippet.rb	Merge branch 'feature/custom-highlighting' into 'master'	2016-06-28 08:42:42 +00:00
spam_log.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
spam_report.rb	Support Akismet spam checking for creation of issues via API	2016-02-02 11:25:44 -02:00
subscription.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
todo.rb	Add approval required todos	2016-07-12 19:01:09 +01:00
tree.rb	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs	2016-02-01 13:51:05 +01:00
u2f_registration.rb	Add a U2fRegistrations table/model.	2016-06-06 12:50:31 +05:30
user.rb	Ensure Owners are included in the scope for authorized_projects	2016-07-19 13:19:04 -06:00
users_star_project.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
wiki_page.rb	add slack notifications for wiki pages	2016-04-20 08:25:40 +08:00