diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 17:32:17 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 17:32:17 +0300 |
| commit | e46a3d2fda47f96885b38c6c6caf7dc3e0df19bd (patch) | |
| tree | 05d362e372d1d84371977fcb8868beffa5fc612f /db | |
| parent | 88892e43adecd68de7940fdc9856a4557098cb6c (diff) | |
| parent | a1a914994f6376b03d95e9d4b05dea422e8610f9 (diff) | |
Merge branch 'git-operation-user' into 'master'
Move GitHooksService into Gitlab::Git
See merge request !13739
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/development/17_cycle_analytics.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20140502125220_migrate_repo_size.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb index 7c1d758dada..383782112a8 100644 --- a/db/fixtures/development/17_cycle_analytics.rb +++ b/db/fixtures/development/17_cycle_analytics.rb @@ -15,7 +15,7 @@ class Gitlab::Seeder::CycleAnalytics # to disable the `pre_receive` hook in order to remove this # dependency on the GitLab API. def stub_git_pre_receive! - GitHooksService.class_eval do + Gitlab::Git::HooksService.class_eval do def run_hook(name) [true, ''] end diff --git a/db/migrate/20140502125220_migrate_repo_size.rb b/db/migrate/20140502125220_migrate_repo_size.rb index f5d5d834307..ca1b054600c 100644 --- a/db/migrate/20140502125220_migrate_repo_size.rb +++ b/db/migrate/20140502125220_migrate_repo_size.rb @@ -11,7 +11,7 @@ class MigrateRepoSize < ActiveRecord::Migration path = File.join(namespace_path, project['project_path'] + '.git') begin - repo = Gitlab::Git::Repository.new('default', path) + repo = Gitlab::Git::Repository.new('default', path, '') if repo.empty? print '-' else |