diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-12 11:13:57 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-12 11:13:57 +0300 |
| commit | 6d81554fb674ac78bf835470adcca19240e1c5e4 (patch) | |
| tree | d8441c5f0edcfb6d0a880ef8470821b820debf40 | |
| parent | 3bc8b4c58c8c9f819781954558c4be908decd4ae (diff) | |
| parent | ba50a4514923186a3131f907da9af1489706a7bb (diff) | |
Merge branch 'zj-remove-10-8-code' into 'master'
Remove dead code post 10.8
See merge request gitlab-org/gitaly!964
| -rw-r--r-- | changelogs/unreleased/zj-remove-10-8-code.yml | 5 | ||||
| -rw-r--r-- | ruby/lib/gitlab/git/committer_with_hooks.rb | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/changelogs/unreleased/zj-remove-10-8-code.yml b/changelogs/unreleased/zj-remove-10-8-code.yml new file mode 100644 index 000000000..fec6c24db --- /dev/null +++ b/changelogs/unreleased/zj-remove-10-8-code.yml @@ -0,0 +1,5 @@ +--- +title: Remove dead code post 10.8 +merge_request: 964 +author: +type: other diff --git a/ruby/lib/gitlab/git/committer_with_hooks.rb b/ruby/lib/gitlab/git/committer_with_hooks.rb index 5840d81df..90e98e729 100644 --- a/ruby/lib/gitlab/git/committer_with_hooks.rb +++ b/ruby/lib/gitlab/git/committer_with_hooks.rb @@ -9,9 +9,6 @@ module Gitlab end def commit - # TODO: Remove after 10.8 - return super unless allowed_to_run_hooks? - result = Gitlab::Git::OperationService.new(git_user, gl_wiki.repository).with_branch( @wiki.ref, start_branch_name: @wiki.ref @@ -27,11 +24,6 @@ module Gitlab private - # TODO: Remove after 10.8 - def allowed_to_run_hooks? - @options[:user_id] != 0 && @options[:username].present? - end - def git_user @git_user ||= Gitlab::Git::User.new(@options[:username], @options[:name], |