Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

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',

app/views/projects/edit.html.haml

@@ -176,7 +176,7 @@
               .form-group
                 = label_tag :new_namespace_id, nil, class: 'control-label' do
                   %span Namespace
-                .col-sm-10
+                .col-sm-9
                   .form-group
                     = select_tag :new_namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace', class: 'select2' }
                   %ul

doc/project_services/irker.md

@@ -34,7 +34,7 @@ need to follow the firsts steps of the next section.
 in the `Server host` field on the Web page
 1. Enter the server port of `irkerd` (e.g. defaults to 6659) in the
 `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
 by the user which is not a full URI.
 1. Specify the recipients (e.g. #channel1, user1, etc.)