diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:28:42 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:28:42 +0300 |
| commit | 9f10943c1a76576ac40d96189a28a4d6123a75d8 (patch) | |
| tree | 88955d92ebc98a4165d66a36cb8a2cf92709981a /spec/models/project_services/slack_service_spec.rb | |
| parent | 84727fba96c6794874e1f94d581408b70e1842a7 (diff) | |
Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/models/project_services/slack_service_spec.rb')
| -rw-r--r-- | spec/models/project_services/slack_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb index 97b60e19e40..69466b11f09 100644 --- a/spec/models/project_services/slack_service_spec.rb +++ b/spec/models/project_services/slack_service_spec.rb @@ -67,7 +67,7 @@ describe SlackService do opts = { title: 'Awesome merge_request', description: 'please fix', - source_branch: 'feature', + source_branch: 'stable', target_branch: 'master' } merge_service = MergeRequests::CreateService.new(project, |