summaryrefslogtreecommitdiff
path: root/app/models/project_services
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-20 16:05:40 +0100
committerDouwe Maan <douwe@gitlab.com>2015-03-03 11:14:32 +0100
commitd86c0cda24a76c9330b5fed59e857ce9e4150b9b (patch)
tree9fd4c7f8cf8c2df5c4ee1ead0993a7b9446c2d46 /app/models/project_services
parent19f04cf989a75f425af09a8551957dae42b1ff31 (diff)
downloadgitlab-ce-d86c0cda24a76c9330b5fed59e857ce9e4150b9b.tar.gz
Fix specs.
Diffstat (limited to 'app/models/project_services')
-rw-r--r--app/models/project_services/slack_service.rb2
-rw-r--r--app/models/project_services/slack_service/base_message.rb (renamed from app/models/project_services/slack_service/slack_base_message.rb)0
-rw-r--r--app/models/project_services/slack_service/issue_message.rb (renamed from app/models/project_services/slack_service/slack_issue_message.rb)2
-rw-r--r--app/models/project_services/slack_service/merge_message.rb (renamed from app/models/project_services/slack_service/slack_merge_message.rb)2
-rw-r--r--app/models/project_services/slack_service/push_message.rb (renamed from app/models/project_services/slack_service/slack_push_message.rb)4
5 files changed, 4 insertions, 6 deletions
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index 8289e474031..279abad8081 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -93,4 +93,4 @@ end
require "slack_service/issue_message"
require "slack_service/push_message"
-require "slack_service/merge_message" \ No newline at end of file
+require "slack_service/merge_message"
diff --git a/app/models/project_services/slack_service/slack_base_message.rb b/app/models/project_services/slack_service/base_message.rb
index aa00d6061a1..aa00d6061a1 100644
--- a/app/models/project_services/slack_service/slack_base_message.rb
+++ b/app/models/project_services/slack_service/base_message.rb
diff --git a/app/models/project_services/slack_service/slack_issue_message.rb b/app/models/project_services/slack_service/issue_message.rb
index cb2e3f7421f..e2fed0bb1b9 100644
--- a/app/models/project_services/slack_service/slack_issue_message.rb
+++ b/app/models/project_services/slack_service/issue_message.rb
@@ -1,4 +1,4 @@
-module SlackService
+class SlackService
class IssueMessage < BaseMessage
attr_reader :username
attr_reader :title
diff --git a/app/models/project_services/slack_service/slack_merge_message.rb b/app/models/project_services/slack_service/merge_message.rb
index 309983e9f1c..4dcce1d15a0 100644
--- a/app/models/project_services/slack_service/slack_merge_message.rb
+++ b/app/models/project_services/slack_service/merge_message.rb
@@ -1,4 +1,4 @@
-module SlackService
+class SlackService
class MergeMessage < BaseMessage
attr_reader :username
attr_reader :project_name
diff --git a/app/models/project_services/slack_service/slack_push_message.rb b/app/models/project_services/slack_service/push_message.rb
index ab2d48f9fb2..2e566bc317b 100644
--- a/app/models/project_services/slack_service/slack_push_message.rb
+++ b/app/models/project_services/slack_service/push_message.rb
@@ -1,6 +1,4 @@
-require 'slack-notifier'
-
-module SlackService
+class SlackService
class PushMessage < BaseMessage
attr_reader :after
attr_reader :before