Merge pull request #303 from UKHomeOffice/projects_improvements

Projects improvements
UKHomeOffice · Sep 17, 2020 · 4741bfe · 4741bfe
2 parents 0fa5872 + 56fed5a
commit 4741bfe
Show file tree

Hide file tree

Showing 11 changed files with 473 additions and 164 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -127,7 +127,7 @@ pipeline:
   api_scan_image:
     image: quay.io/ukhomeofficedigital/anchore-submission:latest
     image_name: platform-hub-api:${DRONE_COMMIT_SHA}
-    whitelist: CVE-2019-5419,CVE-2019-5420,CVE-2020-8130,CVE-2020-11077,CVE-2020-11076,CVE-2020-5247,CVE-2019-16770 
+    whitelist: CVE-2019-5419,CVE-2019-5420,CVE-2020-8130,CVE-2020-11077,CVE-2020-11076,CVE-2020-5247,CVE-2019-16770,CVE-2020-8164,CVE-2020-8165,CVE-2020-8162,CVE-2019-5420 
     when:
       event: [push, tag]
 

diff --git a/platform-hub-api/Gemfile.lock b/platform-hub-api/Gemfile.lock
@@ -183,8 +183,8 @@ GEM
       activesupport (>= 4.2)
       arel (>= 6)
     public_suffix (3.0.3)
-    puma (3.10.0)
-    rack (2.0.7)
+    puma (3.12.6)
+    rack (2.2.3)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.7.2)
@@ -335,4 +335,4 @@ RUBY VERSION
    ruby 2.3.8p459
 
 BUNDLED WITH
-   1.16.2
+   1.17.3
diff --git a/platform-hub-api/app/models/ability.rb b/platform-hub-api/app/models/ability.rb
@@ -26,6 +26,12 @@ def initialize(user)
     can :remove_membership, Project do |project|
       can_administer_project project, user
     end
+    can :set_role, Project do |project|
+      can_administer_project project, user
+    end
+    can :unset_role, Project do |project|
+      can_administer_project project, user
+    end
     can :administer_projects, Project do |project|
       can_administer_project project, user
     end