diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-20 15:27:02 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-24 13:14:00 +0300 |
commit | 7ded7c17d4da00e60d2855560a5c53b6dbaf98c0 (patch) | |
tree | 09c724fa47da7c41d877914bbe67ae8422f7a25b /app | |
parent | f5659ac4d1ad26d4d0ba5ea10adb92511cc911f2 (diff) | |
download | gitlab-ce-7ded7c17d4da00e60d2855560a5c53b6dbaf98c0.tar.gz |
Update project member controller to match recent master logicyesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-success
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/project_members_controller.rb | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index 073d4338338..d08f490de18 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -25,18 +25,16 @@ class Projects::ProjectMembersController < Projects::ApplicationController end def create - if params[:user_ids].blank? && params[:group_ids].blank? + if params[:user_ids].blank? return redirect_to(namespace_project_project_members_path(@project.namespace, @project), alert: 'No users or groups specified.') end - if params[:user_ids].present? - @project.team.add_users( - params[:user_ids].split(','), - params[:access_level], - expires_at: params[:expires_at], - current_user: current_user - ) - end + @project.team.add_users( + params[:user_ids].split(','), + params[:access_level], + expires_at: params[:expires_at], + current_user: current_user + ) redirect_to namespace_project_project_members_path(@project.namespace, @project), notice: 'Users were successfully added.' end |