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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
657838f1
Commit
657838f1
authored
Nov 12, 2016
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! issue and mergerequest slash command for mattermost
parent
9d8ca60d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
app/models/project.rb
app/models/project.rb
+1
-1
app/services/mattermost/command_service.rb
app/services/mattermost/command_service.rb
+1
-1
app/services/mattermost/commands/issue_service.rb
app/services/mattermost/commands/issue_service.rb
+2
-2
app/services/mattermost/commands/merge_request_service.rb
app/services/mattermost/commands/merge_request_service.rb
+1
-1
No files found.
app/models/project.rb
View file @
657838f1
...
@@ -25,7 +25,7 @@ class Project < ActiveRecord::Base
...
@@ -25,7 +25,7 @@ class Project < ActiveRecord::Base
delegate
:feature_available?
,
:builds_enabled?
,
:wiki_enabled?
,
delegate
:feature_available?
,
:builds_enabled?
,
:wiki_enabled?
,
:merge_requests_enabled?
,
:issues_enabled?
,
to: :project_feature
,
:merge_requests_enabled?
,
:issues_enabled?
,
to: :project_feature
,
allow_nil:
true
allow_nil:
true
default_value_for
:archived
,
false
default_value_for
:archived
,
false
default_value_for
:visibility_level
,
gitlab_config_features
.
visibility_level
default_value_for
:visibility_level
,
gitlab_config_features
.
visibility_level
...
...
app/services/mattermost/command_service.rb
View file @
657838f1
...
@@ -32,7 +32,7 @@ module Mattermost
...
@@ -32,7 +32,7 @@ module Mattermost
if
result
.
respond_to?
(
:count
)
if
result
.
respond_to?
(
:count
)
if
count
>
1
if
count
>
1
#TODO
#
TODO
return
resource_list
(
result
)
return
resource_list
(
result
)
else
else
result
=
result
.
first
result
=
result
.
first
...
...
app/services/mattermost/commands/issue_service.rb
View file @
657838f1
...
@@ -20,7 +20,7 @@ module Mattermost
...
@@ -20,7 +20,7 @@ module Mattermost
private
private
#TODO implement create
#
TODO implement create
def
subcommands
def
subcommands
%w[creates search show]
%w[creates search show]
end
end
...
@@ -42,7 +42,7 @@ module Mattermost
...
@@ -42,7 +42,7 @@ module Mattermost
subcommand
=
split
[
1
]
subcommand
=
split
[
1
]
args
=
split
[
2
..-
1
]
args
=
split
[
2
..-
1
]
return
subcommand
,
args
[
subcommand
,
args
]
end
end
end
end
end
end
...
...
app/services/mattermost/commands/merge_request_service.rb
View file @
657838f1
...
@@ -39,7 +39,7 @@ module Mattermost
...
@@ -39,7 +39,7 @@ module Mattermost
subcommand
=
split
[
1
]
subcommand
=
split
[
1
]
args
=
split
[
2
..-
1
]
args
=
split
[
2
..-
1
]
return
subcommand
,
args
[
subcommand
,
args
]
end
end
end
end
end
end
...
...
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