Download as
Browse Code »

Commit 61d98601583b30928076eb7180d444854f0b4f0a

Authored by Dmitriy Zaporozhets
1 parent bbc916ba
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove team mentions

Showing 4 changed files with 9 additions and 9 deletions   Show diff stats
app/views/groups/edit.html.haml
  Diff comments   View file @61d9860
... ... @@ -59,7 +59,7 @@
59 59 = private_icon
60 60 = link_to project.name_with_namespace, project
61 61 .pull-right
62   - = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
  62 + = link_to 'Members', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
63 63 = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
64 64 = link_to 'Remove', project, confirm: remove_project_message(project), method: :delete, class: "btn btn-small btn-remove"
65 65 - if @group.projects.blank?
... ...
app/views/projects/_clone_panel.html.haml
  Diff comments   View file @61d9860
... ... @@ -40,5 +40,5 @@
40 40 - if can?(current_user, :admin_team_member, @project)
41 41 %li.divider
42 42 %li
43   - = link_to new_project_team_member_path(@project), title: "New Team member" do
44   - Team member
  43 + = link_to new_project_team_member_path(@project), title: "New project member" do
  44 + Project member
... ...
app/views/projects/team_members/_form.html.haml
  Diff comments   View file @61d9860
1 1 %h3.page-title
2   - = "New Team member(s)"
  2 + = "New project member(s)"
3 3  
4 4 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
5 5 -if @user_project_relation.errors.any?
... ... @@ -8,13 +8,13 @@
8 8 - @user_project_relation.errors.full_messages.each do |msg|
9 9 %li= msg
10 10  
11   - %h6 1. Choose people you want in the team
  11 + %p 1. Choose people you want in the project
12 12 .control-group
13 13 = f.label :user_ids, "People"
14 14 .controls
15 15 = users_select_tag(:user_ids, multiple: true)
16 16  
17   - %h6 2. Set access level for them
  17 + %p 2. Set access level for them
18 18 .control-group
19 19 = f.label :project_access, "Project Access"
20 20 .controls= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"
... ...
app/views/projects/team_members/index.html.haml
  Diff comments   View file @61d9860
... ... @@ -3,9 +3,9 @@
3 3  
4 4 - if can? current_user, :admin_team_member, @project
5 5 %span.pull-right
6   - = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New Team Member" do
7   - New Team Member
8   - = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
  6 + = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New project member" do
  7 + New project member
  8 + = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import members from another project" do
9 9 Import members
10 10  
11 11 %p.light
... ...