Skip to content
Snippets Groups Projects
Verified Commit e382c8df authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

team member and hook strong params

parent f86afb73
No related branches found
No related tags found
No related merge requests found
Loading
@@ -12,7 +12,7 @@ class Projects::HooksController < Projects::ApplicationController
Loading
@@ -12,7 +12,7 @@ class Projects::HooksController < Projects::ApplicationController
end end
   
def create def create
@hook = @project.hooks.new(params[:hook]) @hook = @project.hooks.new(hook_params)
@hook.save @hook.save
   
if @hook.valid? if @hook.valid?
Loading
@@ -40,4 +40,8 @@ class Projects::HooksController < Projects::ApplicationController
Loading
@@ -40,4 +40,8 @@ class Projects::HooksController < Projects::ApplicationController
def hook def hook
@hook ||= @project.hooks.find(params[:id]) @hook ||= @project.hooks.find(params[:id])
end end
def hook_params
params.require(:hook).permit(:url)
end
end end
Loading
@@ -27,7 +27,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
Loading
@@ -27,7 +27,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
   
def update def update
@user_project_relation = project.users_projects.find_by(user_id: member) @user_project_relation = project.users_projects.find_by(user_id: member)
@user_project_relation.update_attributes(params[:team_member]) @user_project_relation.update_attributes(member_params)
   
unless @user_project_relation.valid? unless @user_project_relation.valid?
flash[:alert] = "User should have at least one role" flash[:alert] = "User should have at least one role"
Loading
@@ -67,4 +67,8 @@ class Projects::TeamMembersController < Projects::ApplicationController
Loading
@@ -67,4 +67,8 @@ class Projects::TeamMembersController < Projects::ApplicationController
def member def member
@member ||= User.find_by(username: params[:id]) @member ||= User.find_by(username: params[:id])
end end
def member_params
params.require(:team_member).permit(:user_id, :project_access)
end
end end
Loading
@@ -16,8 +16,6 @@ class UsersProject < ActiveRecord::Base
Loading
@@ -16,8 +16,6 @@ class UsersProject < ActiveRecord::Base
include Notifiable include Notifiable
include Gitlab::Access include Gitlab::Access
   
#attr_accessible :user, :user_id, :project_access
belongs_to :user belongs_to :user
belongs_to :project belongs_to :project
   
Loading
Loading
Loading
@@ -22,8 +22,6 @@ class WebHook < ActiveRecord::Base
Loading
@@ -22,8 +22,6 @@ class WebHook < ActiveRecord::Base
default_value_for :issues_events, false default_value_for :issues_events, false
default_value_for :merge_requests_events, false default_value_for :merge_requests_events, false
   
#attr_accessible :url
# HTTParty timeout # HTTParty timeout
default_timeout 10 default_timeout 10
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment