summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2016-12-20 14:54:23 +0000
committerLuke "Jared" Bennett <lbennett@gitlab.com>2016-12-20 14:54:23 +0000
commit8d3ed21f2389a3a68dac56c077bc85591bed8b0b (patch)
tree2b7f15e5cdc2610f327adbcdfcd1e294854f4c81
parentccfbbf7dfac61557159d743b776f145fe380527a (diff)
downloadgitlab-ce-8d3ed21f2389a3a68dac56c077bc85591bed8b0b.tar.gz
Pedro copy changes
-rw-r--r--app/views/projects/mattermosts/_team_selection.html.haml9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/views/projects/mattermosts/_team_selection.html.haml b/app/views/projects/mattermosts/_team_selection.html.haml
index 376592e66c9..7980f7c9a72 100644
--- a/app/views/projects/mattermosts/_team_selection.html.haml
+++ b/app/views/projects/mattermosts/_team_selection.html.haml
@@ -4,7 +4,9 @@
%hr
= form_for(:mattermost, method: :post, url: namespace_project_mattermost_path(@project.namespace, @project)) do |f|
%h4 Team
- %p Select or create the team where the slash commands will be used in
+ %p
+ = @teams.one? ? 'The team' : 'Select the team'
+ where the slash commands will be used in
- selected_id = @teams.keys.first if @teams.one?
= f.select(:team_id, mattermost_teams_options(@teams), {}, { class: 'form-control', selected: "#{selected_id}", disabled: @teams.one? })
.help-block
@@ -22,8 +24,9 @@
%p Choose the word that will trigger commands
= f.text_field(:trigger, value: @project.path, class: 'form-control')
.help-block
- %p Trigger word must be unique, and cannot begin with a slash or contain any spaces. Use the word that works best for your team.
- %p Fill in the word that works best for your team.
+ %p
+ Trigger word must be unique, and can't begin with a slash or contain any spaces.
+ Use the word that works best for your team.
%p
Suggestions:
%code= 'gitlab'