summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 12:25:16 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 12:25:16 +0200
commit1b5c483d89d9a20a92e98fc37879389ee2c8dd00 (patch)
tree6f6fbe838ee7504e5a93df8a3da28fca5849acee /app/controllers
parente50556fcc8d81dae5978bcb3e1dd5104789aab0f (diff)
downloadgitlab-ce-1b5c483d89d9a20a92e98fc37879389ee2c8dd00.tar.gz
Consistently use "invitation" rather than "invite" in text.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/groups/group_members_controller.rb4
-rw-r--r--app/controllers/invites_controller.rb6
-rw-r--r--app/controllers/projects/project_members_controller.rb8
3 files changed, 9 insertions, 9 deletions
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index 0018cd34bbe..359eeb4d27a 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -52,9 +52,9 @@ class Groups::GroupMembersController < Groups::ApplicationController
if @group_member.invite?
@group_member.resend_invite
- redirect_to group_group_members_path(@group), notice: 'Invite was successfully resent.'
+ redirect_to group_group_members_path(@group), notice: 'The invitation was successfully resent.'
else
- redirect_to group_group_members_path(@group), alert: 'The invite has already been accepted.'
+ redirect_to group_group_members_path(@group), alert: 'The invitation has already been accepted.'
end
end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 1b236a48e90..00d274a7f1d 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -28,7 +28,7 @@ class InvitesController < ApplicationController
redirect_to path, notice: "You have been granted #{member.human_access} access to #{source}."
else
- redirect_to :back, alert: "The invite could not be accepted."
+ redirect_to :back, alert: "The invitation could not be accepted."
end
end
@@ -52,9 +52,9 @@ class InvitesController < ApplicationController
new_user_session_path
end
- redirect_to path, notice: "You have declined the invite to join #{source}."
+ redirect_to path, notice: "You have declined the invitation to join #{label}."
else
- redirect_to :back, alert: "The invite could not be declined."
+ redirect_to :back, alert: "The invitation could not be declined."
end
end
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index e55e8e4c504..9831a2089be 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -60,15 +60,15 @@ class Projects::ProjectMembersController < Projects::ApplicationController
end
def resend_invite
+ redirect_path = namespace_project_project_members_path(@project.namespace, @project)
+
@project_member = @project.project_members.find(params[:id])
if @project_member.invite?
@project_member.resend_invite
- redirect_to namespace_project_project_members_path(@project.namespace,
- @project), notice: 'Invite was successfully resent.'
+ redirect_to redirect_path, notice: 'The invitation was successfully resent.'
else
- redirect_to namespace_project_project_members_path(@project.namespace,
- @project), alert: 'The invite has already been accepted.'
+ redirect_to redirect_path, alert: 'The invitation has already been accepted.'
end
end