Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d1bf557a
Commit
d1bf557a
authored
Dec 20, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename MattermostNotificationService back to MattermostService
parent
fed29117
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
app/models/project.rb
app/models/project.rb
+1
-1
app/models/project_services/mattermost_service.rb
app/models/project_services/mattermost_service.rb
+2
-2
app/models/service.rb
app/models/service.rb
+1
-1
lib/api/services.rb
lib/api/services.rb
+1
-1
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+1
-1
spec/models/project_services/mattermost_service_spec.rb
spec/models/project_services/mattermost_service_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
app/models/project.rb
View file @
d1bf557a
...
@@ -94,7 +94,7 @@ class Project < ActiveRecord::Base
...
@@ -94,7 +94,7 @@ class Project < ActiveRecord::Base
has_one
:asana_service
,
dependent: :destroy
has_one
:asana_service
,
dependent: :destroy
has_one
:gemnasium_service
,
dependent: :destroy
has_one
:gemnasium_service
,
dependent: :destroy
has_one
:mattermost_slash_commands_service
,
dependent: :destroy
has_one
:mattermost_slash_commands_service
,
dependent: :destroy
has_one
:mattermost_
notification_
service
,
dependent: :destroy
has_one
:mattermost_service
,
dependent: :destroy
has_one
:slack_slash_commands_service
,
dependent: :destroy
has_one
:slack_slash_commands_service
,
dependent: :destroy
has_one
:slack_service
,
dependent: :destroy
has_one
:slack_service
,
dependent: :destroy
has_one
:buildkite_service
,
dependent: :destroy
has_one
:buildkite_service
,
dependent: :destroy
...
...
app/models/project_services/mattermost_
notification_
service.rb
→
app/models/project_services/mattermost_service.rb
View file @
d1bf557a
class
Mattermost
Notification
Service
<
ChatNotificationService
class
MattermostService
<
ChatNotificationService
def
title
def
title
'Mattermost notifications'
'Mattermost notifications'
end
end
...
@@ -8,7 +8,7 @@ class MattermostNotificationService < ChatNotificationService
...
@@ -8,7 +8,7 @@ class MattermostNotificationService < ChatNotificationService
end
end
def
to_param
def
to_param
'mattermost
_notification
'
'mattermost'
end
end
def
help
def
help
...
...
app/models/service.rb
View file @
d1bf557a
...
@@ -216,7 +216,7 @@ class Service < ActiveRecord::Base
...
@@ -216,7 +216,7 @@ class Service < ActiveRecord::Base
jira
jira
kubernetes
kubernetes
mattermost_slash_commands
mattermost_slash_commands
mattermost
_notification
mattermost
pipelines_email
pipelines_email
pivotaltracker
pivotaltracker
pushover
pushover
...
...
lib/api/services.rb
View file @
d1bf557a
...
@@ -500,7 +500,7 @@ module API
...
@@ -500,7 +500,7 @@ module API
desc:
'The channel name'
desc:
'The channel name'
}
}
],
],
'mattermost
-notification
'
=>
[
'mattermost'
=>
[
{
{
required:
true
,
required:
true
,
name: :webhook
,
name: :webhook
,
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
d1bf557a
...
@@ -138,7 +138,7 @@ project:
...
@@ -138,7 +138,7 @@ project:
-
asana_service
-
asana_service
-
gemnasium_service
-
gemnasium_service
-
slack_service
-
slack_service
-
mattermost_
notification_
service
-
mattermost_service
-
buildkite_service
-
buildkite_service
-
bamboo_service
-
bamboo_service
-
teamcity_service
-
teamcity_service
...
...
spec/models/project_services/mattermost_
notification_
service_spec.rb
→
spec/models/project_services/mattermost_service_spec.rb
View file @
d1bf557a
require
'spec_helper'
require
'spec_helper'
describe
Mattermost
Notification
Service
,
models:
true
do
describe
MattermostService
,
models:
true
do
it_behaves_like
"slack or mattermost notifications"
it_behaves_like
"slack or mattermost notifications"
end
end
spec/models/project_spec.rb
View file @
d1bf557a
...
@@ -22,7 +22,7 @@ describe Project, models: true do
...
@@ -22,7 +22,7 @@ describe Project, models: true do
it
{
is_expected
.
to
have_many
(
:protected_branches
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:protected_branches
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:forked_project_link
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:forked_project_link
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:slack_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:slack_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:mattermost_
notification_
service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:mattermost_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:pushover_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:pushover_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:asana_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_one
(
:asana_service
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:boards
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_many
(
:boards
).
dependent
(
:destroy
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment