Rename commit_author to commit_committer

app/controllers/admin/push_rules_controller.rb

@@ -32,8 +32,8 @@ class Admin::PushRulesController < Admin::ApplicationController
       allowed_fields << :reject_unsigned_commits
     end
 
-    if @push_rule.available?(:commit_author_check)
-      allowed_fields << :commit_author_check
+    if @push_rule.available?(:commit_committer_check)
+      allowed_fields << :commit_committer_check
     end
 
     params.require(:push_rule).permit(allowed_fields)

app/controllers/projects/push_rules_controller.rb

@@ -33,8 +33,8 @@ class Projects::PushRulesController < Projects::ApplicationController
       allowed_fields << :reject_unsigned_commits
     end
 
-    if can?(current_user, :change_commit_author_check, project)
-      allowed_fields << :commit_author_check
+    if can?(current_user, :change_commit_committer_check, project)
+      allowed_fields << :commit_committer_check
     end
 
     params.require(:push_rule).permit(allowed_fields)

app/helpers/push_rules_helper.rb

@@ -5,10 +5,10 @@ module PushRulesHelper
     push_rule_update_description(message, push_rule, :reject_unsigned_commits)
   end
 
-  def commit_author_check_description(push_rule)
-    message = [s_("ProjectSettings|Only the author of a commit can push changes to this repository.")]
+  def commit_committer_check_description(push_rule)
+    message = [s_("ProjectSettings|Only the committer of a commit can push changes to this repository.")]
 
-    push_rule_update_description(message, push_rule, :commit_author_check)
+    push_rule_update_description(message, push_rule, :commit_committer_check)
   end
 
   private

app/models/license.rb

@@ -48,7 +48,7 @@ class License < ActiveRecord::Base
     service_desk
     variable_environment_scope
     reject_unsigned_commits
-    commit_author_check
+    commit_committer_check
   ].freeze
 
   EEU_FEATURES = EEP_FEATURES

app/models/push_rule.rb

@@ -7,7 +7,7 @@ class PushRule < ActiveRecord::Base
   FILES_BLACKLIST = YAML.load_file(Rails.root.join('lib/gitlab/checks/files_blacklist.yml'))
   SETTINGS_WITH_GLOBAL_DEFAULT = %i[
     reject_unsigned_commits
-    commit_author_check
+    commit_committer_check
   ].freeze
 
   def self.global
@@ -19,7 +19,7 @@ class PushRule < ActiveRecord::Base
       branch_name_regex.present? ||
       author_email_regex.present? ||
       reject_unsigned_commits ||
-      commit_author_check ||
+      commit_committer_check ||
       member_check ||
       file_name_regex.present? ||
       max_file_size > 0 ||
@@ -34,8 +34,8 @@ class PushRule < ActiveRecord::Base
   end
 
   def committer_allowed?(committer, current_user)
-    return true unless available?(:commit_author_check)
-    return true unless commit_author_check
+    return true unless available?(:commit_committer_check)
+    return true unless commit_committer_check
 
     current_user == committer
   end
@@ -81,13 +81,13 @@ class PushRule < ActiveRecord::Base
     write_setting_with_global_default(:reject_unsigned_commits, value)
   end
 
-  def commit_author_check
-    read_setting_with_global_default(:commit_author_check)
+  def commit_committer_check
+    read_setting_with_global_default(:commit_committer_check)
   end
-  alias_method :commit_author_check?, :commit_author_check
+  alias_method :commit_committer_check?, :commit_committer_check
 
-  def commit_author_check=(value)
-    write_setting_with_global_default(:commit_author_check, value)
+  def commit_committer_check=(value)
+    write_setting_with_global_default(:commit_committer_check, value)
   end
 
   private

app/views/shared/push_rules/_commit_author_check_setting.html.haml → app/views/shared/push_rules/_commit_committer_check_setting.html.haml

-- return unless push_rule.available?(:commit_author_check)
+- return unless push_rule.available?(:commit_committer_check)
 
 - form = local_assigns.fetch(:form)
 - push_rule = local_assigns.fetch(:push_rule)
 
 .form-group
-  = form.check_box :commit_author_check, class: "pull-left", disabled: !can_change_push_rule?(form.object, :commit_author_check)
+  = form.check_box :commit_committer_check, class: "pull-left", disabled: !can_change_push_rule?(form.object, :commit_committer_check)
   .prepend-left-20
-    = form.label :commit_author_check, class: "label-light append-bottom-0" do
+    = form.label :commit_committer_check, class: "label-light append-bottom-0" do
       Author restriction
     %p.light.append-bottom-0
-      = commit_author_check_description(push_rule)
+      = commit_committer_check_description(push_rule)

app/views/shared/push_rules/_form.html.haml

-= render 'shared/push_rules/commit_author_check_setting', form: f, push_rule: f.object
+= render 'shared/push_rules/commit_committer_check_setting', form: f, push_rule: f.object
 
 = render 'shared/push_rules/reject_unsigned_commits_setting', form: f, push_rule: f.object
 

doc/push_rules/push_rules.md

@@ -63,7 +63,7 @@ The following options are available.
 | --------- | :------------: | ----------- |
 | Removal of tags with `git push` | 7.10 | Forbid users to remove git tags with `git push`. Tags will still be able to be deleted through the web UI. |
 | Check whether author is a GitLab user | 7.10 | Restrict commits by author (email) to existing GitLab users. |
-| Check whether author is the current authenticated user | 10.2 | GitLab will reject any commit that does not belongs to the current authenticated user |
+| Check whether committer is the current authenticated user | 10.2 | GitLab will reject any commit that was not committed by the current authenticated user |
 | Check whether commit is signed through GPG | 10.1 | Reject commit when it is not signed through GPG. Read [signing commits with GPG][signing-commits]. |
 | Prevent committing secrets to Git | 8.12 | GitLab will reject any files that are likely to contain secrets. Read [what files are forbidden](#prevent-pushing-secrets-to-the-repository). |
 | Restrict by commit message | 7.10 | Only commit messages that match this Ruby regular expression are allowed to be pushed. Leave empty to allow any commit message. |

ee/app/policies/ee/project_policy.rb

@@ -21,8 +21,8 @@ module EE
       end
 
       with_scope :global
-      condition(:commit_author_check_disabled_globally) do
-        !PushRule.global&.commit_author_check
+      condition(:commit_committer_check_disabled_globally) do
+        !PushRule.global&.commit_committer_check
       end
 
       with_scope :global
@@ -90,7 +90,7 @@ module EE
 
       rule { admin | (reject_unsigned_commits_disabled_globally & can?(:master_access)) }.enable :change_reject_unsigned_commits
 
-      rule { admin | (commit_author_check_disabled_globally & can?(:master_access)) }.enable :change_commit_author_check
+      rule { admin | (commit_committer_check_disabled_globally & can?(:master_access)) }.enable :change_commit_committer_check
     end
   end
 end

spec/features/admin/admin_push_rules_spec.rb

@@ -9,7 +9,7 @@ describe "Admin::PushRules"  do
 
   push_rules_with_titles = {
     reject_unsigned_commits: 'Reject unsigned commits',
-    commit_author_check: 'Author restriction'
+    commit_committer_check: 'Author restriction'
   }
 
   push_rules_with_titles.each do |rule_attr, title|

spec/features/projects/push_rules_spec.rb

@@ -12,7 +12,7 @@ feature 'Projects > Push Rules', :js do
 
   push_rules_with_titles = {
     reject_unsigned_commits: 'Reject unsigned commits',
-    commit_author_check: 'Author restriction'
+    commit_committer_check: 'Author restriction'
   }
 
   push_rules_with_titles.each do |rule_attr, title|

spec/helpers/push_rules_helper_spec.rb

@@ -7,7 +7,7 @@ describe PushRulesHelper do
   let(:project_owner) { push_rule.project.owner }
   let(:possible_help_texts) do
     {
-      commit_author_check_base_help: /Only the author of a commit can push changes to this repository/,
+      commit_committer_check_base_help: /Only the committer of a commit can push changes to this repository/,
       reject_unsigned_commits_base_help: /Only signed commits can be pushed to this repository/,
       default_admin_help: /This setting will be applied to all projects unless overridden by an admin/,
       setting_can_be_overridden: /This setting is applied on the server level and can be overridden by an admin/,

spec/lib/gitlab/checks/change_access_spec.rb

@@ -443,10 +443,10 @@ describe Gitlab::Checks::ChangeAccess do
 
       context 'Check commit author rules' do
         before do
-          stub_licensed_features(commit_author_check: true)
+          stub_licensed_features(commit_committer_check: true)
         end
 
-        let(:push_rule) { create(:push_rule, commit_author_check: true) }
+        let(:push_rule) { create(:push_rule, commit_committer_check: true) }
 
         context 'with a commit from the authenticated user' do
           before do

spec/models/push_rule_spec.rb

@@ -24,7 +24,7 @@ describe PushRule do
       author_email_regex: 'regex',
       file_name_regex: 'regex',
       reject_unsigned_commits: true,
-      commit_author_check: true,
+      commit_committer_check: true,
       member_check: true,
       prevent_secrets: true,
       max_file_size: 1