summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-02-16 11:14:30 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-02-20 12:10:26 -0200
commit48ddf9a407e0f98949301de7a2cbd7d62f8a4e47 (patch)
treef1a813e3c86eaa0507222616c11eeb7de9081e96 /app
parentb05ab108f8f054e137d6ca3df9c211152afa23c7 (diff)
downloadgitlab-ce-48ddf9a407e0f98949301de7a2cbd7d62f8a4e47.tar.gz
Remove task abilities, since we will only ever show the user their own
Diffstat (limited to 'app')
-rw-r--r--app/controllers/dashboard/tasks_controller.rb8
-rw-r--r--app/models/ability.rb11
2 files changed, 0 insertions, 19 deletions
diff --git a/app/controllers/dashboard/tasks_controller.rb b/app/controllers/dashboard/tasks_controller.rb
index 2f049da661c..d5f835babdc 100644
--- a/app/controllers/dashboard/tasks_controller.rb
+++ b/app/controllers/dashboard/tasks_controller.rb
@@ -1,6 +1,4 @@
class Dashboard::TasksController < Dashboard::ApplicationController
- before_action :authorize_destroy_task!, only: [:destroy]
-
def index
@tasks = case params[:state]
when 'done'
@@ -23,12 +21,6 @@ class Dashboard::TasksController < Dashboard::ApplicationController
private
- def authorize_destroy_task!
- unless can?(current_user, :destroy_task, task)
- return render_404
- end
- end
-
def task
@task ||= current_user.tasks.find(params[:id])
end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 5e0c76004d2..a866eadeebb 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -17,7 +17,6 @@ class Ability
when Namespace then namespace_abilities(user, subject)
when GroupMember then group_member_abilities(user, subject)
when ProjectMember then project_member_abilities(user, subject)
- when Task then task_abilities(user, subject)
else []
end.concat(global_abilities(user))
end
@@ -417,16 +416,6 @@ class Ability
rules
end
- def task_abilities(user, task)
- rules = []
-
- if task && task.user == user
- rules << :destroy_task
- end
-
- rules
- end
-
def abilities
@abilities ||= begin
abilities = Six.new