diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2015-07-08 06:52:28 +0000 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-07-08 06:52:28 +0000 |
commit | 854679cb80266a721846abe4467f8f14166933ee (patch) | |
tree | 08b8a27e681546151f22f7bffebf2e33bb423bf9 /app | |
parent | d8c9d948178e15a9eb426a60aa803e2f628d5350 (diff) | |
parent | 954eedf3689775a9b4d2ed3fb33985f82ba17f0d (diff) | |
download | gitlab-ce-854679cb80266a721846abe4467f8f14166933ee.tar.gz |
Merge branch 'fix-irker-capitalization' into 'master'
Change "Irc Uri" -> "IRC URI"
See merge request !937
Diffstat (limited to 'app')
-rw-r--r-- | app/models/project_services/irker_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb index a4d0914dbe7..d24aa317cf3 100644 --- a/app/models/project_services/irker_service.rb +++ b/app/models/project_services/irker_service.rb @@ -63,7 +63,7 @@ class IrkerService < Service help: 'Irker daemon hostname (defaults to localhost)' }, { type: 'text', name: 'server_port', placeholder: 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)', placeholder: 'irc://irc.network.net:6697/' }, { type: 'textarea', name: 'recipients', |