Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/admin/groups/show.html.haml2
-rw-r--r--app/views/groups/_new_group_member.html.haml2
-rw-r--r--features/steps/admin/groups.rb2
-rw-r--r--features/steps/groups.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 8057de38805..d356aff6365 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -64,7 +64,7 @@
%div.prepend-top-10
= select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
%hr
- = button_tag 'Add users into group', class: "btn btn-create"
+ = button_tag 'Add users to group', class: "btn btn-create"
.panel.panel-default
.panel-heading
%h3.panel-title
diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml
index ed00153de7e..345c0555a36 100644
--- a/app/views/groups/_new_group_member.html.haml
+++ b/app/views/groups/_new_group_member.html.haml
@@ -12,4 +12,4 @@
%strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
.form-actions
- = f.submit 'Add users into group', class: "btn btn-create"
+ = f.submit 'Add users to group', class: "btn btn-create"
diff --git a/features/steps/admin/groups.rb b/features/steps/admin/groups.rb
index 4171398e568..5e45063b4b5 100644
--- a/features/steps/admin/groups.rb
+++ b/features/steps/admin/groups.rb
@@ -41,7 +41,7 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps
within "#new_team_member" do
select "Reporter", from: "access_level"
end
- click_button "Add users into group"
+ click_button "Add users to group"
end
step 'I should see "John Doe" in team list in every project as "Reporter"' do
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index f09d751dba3..895ee7ba081 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -34,7 +34,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
select2(user.id, from: "#user_ids", multiple: true)
select "Reporter", from: "access_level"
end
- click_button "Add users into group"
+ click_button "Add users to group"
end
step 'I should see user "John Doe" in team list' do