summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-27 12:59:44 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-27 12:59:44 +0300
commit61d98601583b30928076eb7180d444854f0b4f0a (patch)
tree26f9c94f842771aa838162d32e0a8a5802e20423 /app/views/projects
parentbbc916baeecfd848eba86dd71c83623a79512a68 (diff)
downloadgitlab-ce-61d98601583b30928076eb7180d444854f0b4f0a.tar.gz
Remove team mentions
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/_clone_panel.html.haml4
-rw-r--r--app/views/projects/team_members/_form.html.haml6
-rw-r--r--app/views/projects/team_members/index.html.haml6
3 files changed, 8 insertions, 8 deletions
diff --git a/app/views/projects/_clone_panel.html.haml b/app/views/projects/_clone_panel.html.haml
index 4aee2b16bdb..f7889b8eb05 100644
--- a/app/views/projects/_clone_panel.html.haml
+++ b/app/views/projects/_clone_panel.html.haml
@@ -40,5 +40,5 @@
- if can?(current_user, :admin_team_member, @project)
%li.divider
%li
- = link_to new_project_team_member_path(@project), title: "New Team member" do
- Team member
+ = link_to new_project_team_member_path(@project), title: "New project member" do
+ Project member
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index f96fa217fa3..5214a54e909 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -1,5 +1,5 @@
%h3.page-title
- = "New Team member(s)"
+ = "New project member(s)"
= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
-if @user_project_relation.errors.any?
@@ -8,13 +8,13 @@
- @user_project_relation.errors.full_messages.each do |msg|
%li= msg
- %h6 1. Choose people you want in the team
+ %p 1. Choose people you want in the project
.control-group
= f.label :user_ids, "People"
.controls
= users_select_tag(:user_ids, multiple: true)
- %h6 2. Set access level for them
+ %p 2. Set access level for them
.control-group
= f.label :project_access, "Project Access"
.controls= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index 88325587f44..acbe82919f1 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -3,9 +3,9 @@
- if can? current_user, :admin_team_member, @project
%span.pull-right
- = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New Team Member" do
- New Team Member
- = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
+ = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New project member" do
+ New project member
+ = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import members from another project" do
Import members
%p.light