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
Kazuhiko Shiozaki
gitlab-ce
Commits
854679cb
Commit
854679cb
authored
Jul 08, 2015
by
Robert Schilling
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-irker-capitalization' into 'master'
Change "Irc Uri" -> "IRC URI" See merge request !937
parents
d8c9d948
954eedf3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/project_services/irker_service.rb
app/models/project_services/irker_service.rb
+1
-1
doc/project_services/irker.md
doc/project_services/irker.md
+1
-1
No files found.
app/models/project_services/irker_service.rb
View file @
854679cb
...
@@ -63,7 +63,7 @@ class IrkerService < Service
...
@@ -63,7 +63,7 @@ class IrkerService < Service
help:
'Irker daemon hostname (defaults to localhost)'
},
help:
'Irker daemon hostname (defaults to localhost)'
},
{
type:
'text'
,
name:
'server_port'
,
placeholder:
6659
,
{
type:
'text'
,
name:
'server_port'
,
placeholder:
6659
,
help:
'Irker daemon port (defaults to 6659)'
},
help:
'Irker daemon port (defaults to 6659)'
},
{
type:
'text'
,
name:
'default_irc_uri'
,
{
type:
'text'
,
name:
'default_irc_uri'
,
title:
'Default IRC URI'
,
help:
'A default IRC URI to prepend before each recipient (optional)'
,
help:
'A default IRC URI to prepend before each recipient (optional)'
,
placeholder:
'irc://irc.network.net:6697/'
},
placeholder:
'irc://irc.network.net:6697/'
},
{
type:
'textarea'
,
name:
'recipients'
,
{
type:
'textarea'
,
name:
'recipients'
,
...
...
doc/project_services/irker.md
View file @
854679cb
...
@@ -34,7 +34,7 @@ need to follow the firsts steps of the next section.
...
@@ -34,7 +34,7 @@ need to follow the firsts steps of the next section.
in the
`Server host`
field on the Web page
in the
`Server host`
field on the Web page
1.
Enter the server port of
`irkerd`
(e.g. defaults to 6659) in the
1.
Enter the server port of
`irkerd`
(e.g. defaults to 6659) in the
`Server port`
field on the Web page.
`Server port`
field on the Web page.
1.
Optional: if
`Default
irc uri
`
is set, it has to be in the format
1.
Optional: if
`Default
IRC URI
`
is set, it has to be in the format
`irc[s]://domain.name`
and will be prepend to each and every channel provided
`irc[s]://domain.name`
and will be prepend to each and every channel provided
by the user which is not a full URI.
by the user which is not a full URI.
1.
Specify the recipients (e.g. #channel1, user1, etc.)
1.
Specify the recipients (e.g. #channel1, user1, etc.)
...
...
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