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
..
admin	Merge branch 'issue_8110' into 'master'	2016-07-20 15:56:06 +00:00
ci	Enable Style/SpaceAfterColon Rubocop cops	2016-06-29 15:16:04 +02:00
concerns	Refactor service settings view	2016-07-20 12:11:37 -03:00
dashboard	Cache todos pending/done dashboard query counts	2016-07-12 18:57:52 +02:00
explore
groups	Exclude requesters from Project#members, Group#members and User#members	2016-07-01 17:44:46 +02:00
import	fix 404 error, redirect back with flash message	2016-07-07 15:34:45 +02:00
oauth
profiles	Load Javascript U2F library selectively.	2016-07-14 08:19:09 +05:30
projects	Merge branch 'issue_8110' into 'master'	2016-07-20 15:56:06 +00:00
sherlock
abuse_reports_controller.rb
application_controller.rb	Load Javascript U2F library selectively.	2016-07-14 08:19:09 +05:30
autocomplete_controller.rb	Fixed issue with move dropdown not being searchable	2016-06-15 08:53:11 +01:00
confirmations_controller.rb	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
dashboard_controller.rb
emojis_controller.rb
groups_controller.rb	Allow to disable user request access to groups/projects	2016-07-20 14:38:21 +02:00
health_check_controller.rb
help_controller.rb	Clean path info	2016-07-11 13:12:55 -06:00
invites_controller.rb	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
jwt_controller.rb	Improve Gitlab::Auth method names	2016-06-10 14:51:16 +02:00
namespaces_controller.rb
notification_settings_controller.rb	merge master into issue_3359_3	2016-06-29 11:04:18 -03:00
omniauth_callbacks_controller.rb	Added tests for 2FA check on OAuth request	2016-07-04 11:00:34 -05:00
passwords_controller.rb
profiles_controller.rb
projects_controller.rb	Allow to disable user request access to groups/projects	2016-07-20 14:38:21 +02:00
registrations_controller.rb
root_controller.rb
search_controller.rb
sent_notifications_controller.rb
sessions_controller.rb	Merge branch '18225-avoid-full-table-users-count' into 'master'	2016-06-15 15:12:56 +00:00
snippets_controller.rb
uploads_controller.rb
users_controller.rb