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:
authorJose Ivan Vargas <jvargas@gitlab.com>2016-12-28 21:54:40 +0300
committerJose Ivan Vargas <jvargas@gitlab.com>2017-01-03 19:52:14 +0300
commit075aae2503d245c3618a4314d12daa22aac6a624 (patch)
tree0e5540b8292cc936f919a317bd6153afe996624d /app/controllers/projects/group_links_controller.rb
parent99c263ad10c5265f59586dbd33f3af6b3a2347f5 (diff)
Updated the "users" to "members" matches in the view
Reverted the change from the "expires_at" to "expires_at_groups" in the groups controller
Diffstat (limited to 'app/controllers/projects/group_links_controller.rb')
-rw-r--r--app/controllers/projects/group_links_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index 4296283cd64..66b7bdbd988 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -16,13 +16,13 @@ class Projects::GroupLinksController < Projects::ApplicationController
project.project_group_links.create(
group: group,
group_access: params[:link_group_access],
- expires_at: params[:expires_at] || params[:expires_at_groups]
+ expires_at: params[:expires_at]
)
else
flash[:alert] = 'Please select a group.'
end
- redirect_to namespace_project_group_links_path(project.namespace, project)
+ redirect_to namespace_project_settings_members_path(project.namespace, project)
end
def update
@@ -36,7 +36,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
respond_to do |format|
format.html do
- redirect_to namespace_project_group_links_path(project.namespace, project)
+ redirect_to namespace_project_settings_members_path(project.namespace, project)
end
format.js { head :ok }
end