summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-09 11:21:18 -0700
committerYves Senn <yves.senn@gmail.com>2013-07-09 11:21:18 -0700
commita8b544ed770cf172b09feb6ffee14b1814b66ad4 (patch)
treeca60e183ca41491798a498e3487cb94f8043f62f
parente1ac3db92741907b5c085d3e236a02d953cfe0cc (diff)
parent1da67c2cec044d5bc681361889e9850d2cb69759 (diff)
downloadgitlab-ce-a8b544ed770cf172b09feb6ffee14b1814b66ad4.tar.gz
Merge pull request #4519 from kwongius/team-assignment-text
Fix header text for setting greatest team access to a project
-rw-r--r--app/views/admin/teams/projects/new.html.haml2
-rw-r--r--app/views/projects/teams/available.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/teams/projects/new.html.haml b/app/views/admin/teams/projects/new.html.haml
index dcb3dbbc433..21bf65f9c3d 100644
--- a/app/views/admin/teams/projects/new.html.haml
+++ b/app/views/admin/teams/projects/new.html.haml
@@ -8,7 +8,7 @@
.input
= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
- %h6 Choose greatest user acces for your team in this projects:
+ %h6 Choose greatest user access for your team in these projects:
.clearfix
= label_tag :greatest_project_access, "Greatest Access"
.input
diff --git a/app/views/projects/teams/available.html.haml b/app/views/projects/teams/available.html.haml
index 29fe8ed25cd..880a02aeaf5 100644
--- a/app/views/projects/teams/available.html.haml
+++ b/app/views/projects/teams/available.html.haml
@@ -10,7 +10,7 @@
.padded
= label_tag :team_id, "Team"
.input= select_tag(:team_id, options_from_collection_for_select(@teams, :id, :name), prompt: "Select team", class: "chosen xxlarge", required: true)
- %p.slead Choose greatest user acces in team you want to assign:
+ %p.slead Choose greatest user access for your team in this project:
.padded
= label_tag :team_ids, "Permission"
.input= select_tag :greatest_project_access, options_for_select(UserTeam.access_roles), {class: "project-access-select chosen span3" }