diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-23 01:03:57 +0100 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-23 01:03:57 +0100 |
| commit | db2c15369c365340aeaf4e431e8838714b40396b (patch) | |
| tree | 26ca045a337132370b67cc8f2ed4010e3087dfa5 /app/contexts | |
| parent | b47173da6a0fea0982d009f91e2c4d042f9b5c37 (diff) | |
| parent | 68c43d59f09a66cca0da1b9a50c11421d52eac9a (diff) | |
| download | gitlab-ce-db2c15369c365340aeaf4e431e8838714b40396b.tar.gz | |
Merge branch 'master' into discussions
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
Diffstat (limited to 'app/contexts')
| -rw-r--r-- | app/contexts/project_update_context.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/contexts/project_update_context.rb b/app/contexts/project_update_context.rb index e28d43d0e81..5b77d0a7964 100644 --- a/app/contexts/project_update_context.rb +++ b/app/contexts/project_update_context.rb @@ -2,7 +2,9 @@ class ProjectUpdateContext < BaseContext def execute(role = :default) namespace_id = params[:project].delete(:namespace_id) - if namespace_id.present? + allowed_transfer = can?(current_user, :change_namespace, project) || role == :admin + + if allowed_transfer && namespace_id.present? if namespace_id == Namespace.global_id if project.namespace.present? # Transfer to global namespace from anyone |