delta/gitlab/gitlab-ce.git/spec/models/service_spec.rb, branch bootstrap-markdown-code-highlight

Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6'

2018-04-05T06:41:56+00:00

[10.6] Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2366
# Conflicts:
#	app/helpers/services_helper.rb

When a Service templates are invalid newly created projects will have them inactive

2018-03-28T15:28:55+00:00

Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rb

2018-01-17T01:08:03+00:00

Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3'

2018-01-17T01:04:38+00:00

Filter out sensitive fields from the project services API

See merge request gitlab/gitlabhq!2281

(cherry picked from commit 476f2576444632f2a9a61b4cead9c1077f2c81d7)

2bcbbda0 Filter out sensitive fields from the project services API

Create Kubernetes based on Application Templates

2018-01-04T22:35:41+00:00

41054-Disallow creation of new Kubernetes integrations

2018-01-04T09:33:51+00:00

Change all `:empty_project` to `:project`

2017-08-02T21:47:31+00:00

Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true

2017-07-27T12:31:53+00:00

Signed-off-by: Rémy Coutable

Merge branch '31138-improve-test-settings-for-services-in-empty-projects' into 'master'

2017-04-27T19:16:31+00:00


improves test settings for chat notification services for empty projects

Closes #31138

See merge request !10886

improves test settings for chat notification services for empty projects

2017-04-27T17:36:10+00:00