From 9d8afa222c678a2222f5219458759897089d7dad Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 16 Sep 2016 12:46:33 +0200
Subject: [PATCH] Improve code comments
---
app/models/ci/build.rb | 2 +-
app/policies/project_policy.rb | 2 +-
.../auth/container_registry_authentication_service.rb | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 0b017c98916..57ef4646d24 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -179,7 +179,7 @@ module Ci
end
def repo_url
- auth = "gitlab-ci-token:#{ensure_token}@"
+ auth = "gitlab-ci-token:#{ensure_token!}@"
project.http_url_to_repo.sub(/^https?:\/\//) do |prefix|
prefix + auth
end
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index ce686af2ade..00c4c7b1440 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -64,7 +64,7 @@ class ProjectPolicy < BasePolicy
can! :read_deployment
end
- # Permissions given when an user is direct member of a group
+ # Permissions given when an user is team member of a project
def team_member_reporter_access!
can! :build_download_code
can! :build_read_container_image
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 36120a5bc99..98da6563947 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -90,7 +90,7 @@ module Auth
def build_can_pull?(requested_project)
# Build can:
- # 1. pull from it's own project (for ex. a build)
+ # 1. pull from its own project (for ex. a build)
# 2. read images from dependent projects if creator of build is a team member
@authentication_abilities.include?(:build_read_container_image) &&
(requested_project == project || can?(current_user, :build_read_container_image, requested_project))
@@ -102,7 +102,7 @@ module Auth
end
def build_can_push?(requested_project)
- # Build can push only to project to from which he originates
+ # Build can push only to the project from which it originates
@authentication_abilities.include?(:build_create_container_image) &&
requested_project == project
end
--
GitLab