Rename `images` to `container_registry`

1 files changed, 8 insertions, 4 deletions

diff --git a/app/models/ability.rb b/app/models/ability.rb
index ba27b9a9b14..59d5195f5b9 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -203,7 +203,7 @@ class Ability
         :admin_label,
         :read_commit_status,
         :read_build,
-        :read_image,
+        :read_container_registry,
       ]
     end
 
@@ -218,8 +218,8 @@ class Ability
         :create_merge_request,
         :create_wiki,
         :push_code,
-        :create_image,
-        :update_image,
+        :create_container_registry,
+        :update_container_registry,
       ]
     end
 
@@ -246,7 +246,7 @@ class Ability
         :admin_project,
         :admin_commit_status,
         :admin_build,
-        :admin_image
+        :admin_container_registry,
       ]
     end
 
@@ -291,6 +291,10 @@ class Ability
         rules += named_abilities('build')
       end
 
+      unless project.container_registry_enabled
+        rules += named_abilities('container_registry')
+      end
+
       rules
     end