summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/project.rb2
-rw-r--r--app/services/mattermost/command_service.rb2
-rw-r--r--app/services/mattermost/commands/issue_service.rb4
-rw-r--r--app/services/mattermost/commands/merge_request_service.rb2
4 files changed, 5 insertions, 5 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 1c392eb7460..ec64e4bc11d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -25,7 +25,7 @@ class Project < ActiveRecord::Base
delegate :feature_available?, :builds_enabled?, :wiki_enabled?,
:merge_requests_enabled?, :issues_enabled?, to: :project_feature,
- allow_nil: true
+ allow_nil: true
default_value_for :archived, false
default_value_for :visibility_level, gitlab_config_features.visibility_level
diff --git a/app/services/mattermost/command_service.rb b/app/services/mattermost/command_service.rb
index c8329a2dca4..b1017a1eb53 100644
--- a/app/services/mattermost/command_service.rb
+++ b/app/services/mattermost/command_service.rb
@@ -32,7 +32,7 @@ module Mattermost
if result.respond_to?(:count)
if count > 1
- #TODO
+ # TODO
return resource_list(result)
else
result = result.first
diff --git a/app/services/mattermost/commands/issue_service.rb b/app/services/mattermost/commands/issue_service.rb
index 879f0c2eb21..4472098e566 100644
--- a/app/services/mattermost/commands/issue_service.rb
+++ b/app/services/mattermost/commands/issue_service.rb
@@ -20,7 +20,7 @@ module Mattermost
private
- #TODO implement create
+ # TODO implement create
def subcommands
%w[creates search show]
end
@@ -42,7 +42,7 @@ module Mattermost
subcommand = split[1]
args = split[2..-1]
- return subcommand, args
+ [subcommand, args]
end
end
end
diff --git a/app/services/mattermost/commands/merge_request_service.rb b/app/services/mattermost/commands/merge_request_service.rb
index 907834ee0c2..a27b3861b23 100644
--- a/app/services/mattermost/commands/merge_request_service.rb
+++ b/app/services/mattermost/commands/merge_request_service.rb
@@ -39,7 +39,7 @@ module Mattermost
subcommand = split[1]
args = split[2..-1]
- return subcommand, args
+ [subcommand, args]
end
end
end