deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed protected branches and file edit

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-04 21:45:30 +02:00
parent afbdbb0c95
commit ef5b36eaaf
9 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/users_controller.rb
View file

@ -19,9 +19,9 @@ class Admin::UsersController < AdminController
def team_update
@admin_user = User.find(params[:id])
UsersProject.user_bulk_import(
@admin_user,
UsersProject.add_users_into_projects(
params[:project_ids],
[@admin_user.id],
params[:project_access]
)

2
app/controllers/tree_controller.rb
View file

@ -22,7 +22,7 @@ class TreeController < ProjectResourceController
end
def edit
@last_commit = @project.last_commit_for(@ref, @path).sha
@last_commit = @project.repository.last_commit_for(@ref, @path).sha
end
def update