From 99ee86206e3e19dd93910a4e7a3a5b6e3a7add9a Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Mon, 8 Aug 2016 10:07:15 -0700
Subject: remove six, and use a Set instead

---
 lib/api/helpers.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index da4b1bf9902..1afca5fe2e8 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -409,11 +409,7 @@ module API
     end
 
     def abilities
-      @abilities ||= begin
-                       abilities = Six.new
-                       abilities << Ability
-                       abilities
-                     end
+      Ability
     end
 
     def secret_token
-- 
cgit v1.2.1


From 5853c96b49010aaf33b85caeb94dfc18873d5656 Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Mon, 8 Aug 2016 11:55:13 -0700
Subject: remove Ability.abilities

---
 lib/api/helpers.rb                         | 6 +-----
 lib/banzai/reference_parser/base_parser.rb | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 1afca5fe2e8..fdb70af694d 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -148,7 +148,7 @@ module API
     end
 
     def can?(object, action, subject)
-      abilities.allowed?(object, action, subject)
+      Ability.allowed?(object, action, subject)
     end
 
     # Checks the occurrences of required attributes, each attribute must be present in the params hash
@@ -408,10 +408,6 @@ module API
       links.join(', ')
     end
 
-    def abilities
-      Ability
-    end
-
     def secret_token
       File.read(Gitlab.config.gitlab_shell.secret_file).chomp
     end
diff --git a/lib/banzai/reference_parser/base_parser.rb b/lib/banzai/reference_parser/base_parser.rb
index 6cf218aaa0d..e8e03e4a98f 100644
--- a/lib/banzai/reference_parser/base_parser.rb
+++ b/lib/banzai/reference_parser/base_parser.rb
@@ -211,7 +211,7 @@ module Banzai
       end
 
       def can?(user, permission, subject)
-        Ability.abilities.allowed?(user, permission, subject)
+        Ability.allowed?(user, permission, subject)
       end
 
       def find_projects_for_hash_keys(hash)
-- 
cgit v1.2.1


From 2bdcef4d672121a387fca6da720d333dda8f7af6 Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Thu, 18 Aug 2016 16:12:32 -0700
Subject: use a nil subject when we want to check global abilities

---
 lib/api/groups.rb  | 2 +-
 lib/api/helpers.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 9d8b8d737a9..f981ec0dbfe 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -30,7 +30,7 @@ module API
       # Example Request:
       #   POST /groups
       post do
-        authorize! :create_group, current_user
+        authorize! :create_group
         required_attributes! [:name, :path]
 
         attrs = attributes_for_keys [:name, :path, :description, :visibility_level]
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index fdb70af694d..6a20ba95a79 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -129,7 +129,7 @@ module API
       forbidden! unless current_user.is_admin?
     end
 
-    def authorize!(action, subject)
+    def authorize!(action, subject = nil)
       forbidden! unless can?(current_user, action, subject)
     end
 
-- 
cgit v1.2.1