Merge branch 'devel' into v1.x

Apply last patches for next 1.0.1 version

Author: root

app/controllers/download_git_revision_controller.rb

@@ -36,7 +36,7 @@ def set_repository
 
 
     def can_download_git_revision
-      render_403 unless view_context.user_allowed_to(:download_git_revision, @project)
+      render_403 unless User.current.allowed_to_download?(@repository)
     end
 
 

app/controllers/gitolite_public_keys_controller.rb

@@ -70,7 +70,7 @@ def set_user_from_params
 
 
     def set_user_from_current_user
-      if User.current.allowed_to?(:create_gitolite_ssh_key, nil, global: true)
+      if User.current.allowed_to_ssh?
         @user = User.current
         @redirect_url = url_for(controller: 'gitolite_public_keys', action: 'index')
         @cancel_url = url_for(controller: 'my', action: 'account')

app/controllers/repository_deployment_credentials_controller.rb

@@ -85,17 +85,17 @@ def set_current_tab
 
 
     def can_view_credentials
-      render_403 unless view_context.user_allowed_to(:view_deployment_keys, @project)
+      render_403 unless User.current.git_allowed_to?(:view_deployment_keys, @repository)
     end
 
 
     def can_create_credentials
-      render_403 unless view_context.user_allowed_to(:create_deployment_keys, @project)
+      render_403 unless User.current.git_allowed_to?(:create_deployment_keys, @repository)
     end
 
 
     def can_edit_credentials
-      render_403 unless view_context.user_allowed_to(:edit_deployment_keys, @project)
+      render_403 unless User.current.git_allowed_to?(:edit_deployment_keys, @repository)
     end
 
 
@@ -142,7 +142,7 @@ def other_deployment_keys
 
 
     def users_allowed_to_create_deployment_keys
-      @project.users.select { |user| user != User.current && user.allowed_to?(:create_deployment_keys, @project) }
+      @project.users.select { |user| user != User.current && user.git_allowed_to?(:create_deployment_keys, @repository) }
     end
 
 

app/controllers/repository_git_config_keys_controller.rb

@@ -77,17 +77,17 @@ def set_current_tab
 
 
     def can_view_config_keys
-      render_403 unless view_context.user_allowed_to(:view_repository_git_config_keys, @project)
+      render_403 unless User.current.git_allowed_to?(:view_repository_git_config_keys, @repository)
     end
 
 
     def can_create_config_keys
-      render_403 unless view_context.user_allowed_to(:create_repository_git_config_keys, @project)
+      render_403 unless User.current.git_allowed_to?(:create_repository_git_config_keys, @repository)
     end
 
 
     def can_edit_config_keys
-      render_403 unless view_context.user_allowed_to(:edit_repository_git_config_keys, @project)
+      render_403 unless User.current.git_allowed_to?(:edit_repository_git_config_keys, @repository)
     end
 
 

app/controllers/repository_git_notifications_controller.rb

@@ -82,17 +82,17 @@ def set_current_tab
 
 
     def can_view_git_notifications
-      render_403 unless view_context.user_allowed_to(:view_repository_git_notifications, @project)
+      render_403 unless User.current.git_allowed_to?(:view_repository_git_notifications, @repository)
     end
 
 
     def can_create_git_notifications
-      render_403 unless view_context.user_allowed_to(:create_repository_git_notifications, @project)
+      render_403 unless User.current.git_allowed_to?(:create_repository_git_notifications, @repository)
     end
 
 
     def can_edit_git_notifications
-      render_403 unless view_context.user_allowed_to(:edit_repository_git_notifications, @project)
+      render_403 unless User.current.git_allowed_to?(:edit_repository_git_notifications, @repository)
     end
 
 

app/controllers/repository_mirrors_controller.rb

@@ -74,17 +74,17 @@ def set_current_tab
 
 
     def can_view_mirrors
-      render_403 unless view_context.user_allowed_to(:view_repository_mirrors, @project)
+      render_403 unless User.current.git_allowed_to?(:view_repository_mirrors, @repository)
     end
 
 
     def can_create_mirrors
-      render_403 unless view_context.user_allowed_to(:create_repository_mirrors, @project)
+      render_403 unless User.current.git_allowed_to?(:create_repository_mirrors, @repository)
     end
 
 
     def can_edit_mirrors
-      render_403 unless view_context.user_allowed_to(:edit_repository_mirrors, @project)
+      render_403 unless User.current.git_allowed_to?(:edit_repository_mirrors, @repository)
     end
 
 

app/controllers/repository_post_receive_urls_controller.rb

@@ -68,17 +68,17 @@ def set_current_tab
 
 
     def can_view_post_receive_urls
-      render_403 unless view_context.user_allowed_to(:view_repository_post_receive_urls, @project)
+      render_403 unless User.current.git_allowed_to?(:view_repository_post_receive_urls, @repository)
     end
 
 
     def can_create_post_receive_urls
-      render_403 unless view_context.user_allowed_to(:create_repository_post_receive_urls, @project)
+      render_403 unless User.current.git_allowed_to?(:create_repository_post_receive_urls, @repository)
     end
 
 
     def can_edit_post_receive_urls
-      render_403 unless view_context.user_allowed_to(:edit_repository_post_receive_urls, @project)
+      render_403 unless User.current.git_allowed_to?(:edit_repository_post_receive_urls, @repository)
     end
 
 

app/controllers/repository_protected_branches_controller.rb

@@ -96,17 +96,17 @@ def set_current_tab
 
 
     def can_view_protected_branches
-      render_403 unless view_context.user_allowed_to(:view_repository_protected_branches, @project)
+      render_403 unless User.current.git_allowed_to?(:view_repository_protected_branches, @repository)
     end
 
 
     def can_create_protected_branches
-      render_403 unless view_context.user_allowed_to(:create_repository_protected_branches, @project)
+      render_403 unless User.current.git_allowed_to?(:create_repository_protected_branches, @repository)
     end
 
 
     def can_edit_protected_branches
-      render_403 unless view_context.user_allowed_to(:edit_repository_protected_branches, @project)
+      render_403 unless User.current.git_allowed_to?(:edit_repository_protected_branches, @repository)
     end
 
 

app/helpers/git_hosting_helper.rb

@@ -24,15 +24,6 @@ def label_with_icon(label, icon, opts = {})
   end
 
 
-  def user_allowed_to(permission, project)
-    if project.active?
-      return User.current.allowed_to?(permission, project)
-    else
-      return User.current.allowed_to?(permission, nil, global: true)
-    end
-  end
-
-
   def plugin_asset_link(plugin_name, asset_name)
     File.join(Redmine::Utils.relative_url_root, 'plugin_assets', plugin_name, 'images', asset_name)
   end

app/models/concerns/gitolitable_features.rb

@@ -68,6 +68,11 @@ def protected_branches_enabled?
   end
 
 
+  def public_project?
+    project.is_public?
+  end
+
+
   def public_repo?
     extra[:public_repo]
   end