gitlab-org--gitlab-foss/lib/gitlab/git
Grzegorz Bizon 57906a5322 Merge branch 'gitaly-conflict-resolver' into 'master'
Gitaly conflict resolver

Closes gitaly#813

See merge request gitlab-org/gitlab-ce!15755
2018-01-03 08:39:16 +00:00
..
conflict Simplify conflict resolution interface and code 2018-01-02 16:22:02 -03:00
storage Keep track of storage check timings 2017-12-11 13:18:39 +01:00
attributes.rb
blame.rb
blob.rb Add link to gitaly converation 2017-11-30 17:05:55 +01:00
blob_snippet.rb
branch.rb Fetch the merged branches at once 2017-10-27 15:55:08 +00:00
commit.rb Load commit in batches for pipelines#index 2017-12-19 10:05:40 +01:00
commit_stats.rb
compare.rb
diff.rb
diff_collection.rb
env.rb Add Gitlab::Git::Env.to_env_hash 2017-10-16 13:19:44 +02:00
gitlab_projects.rb Import gitlab_projects.rb from gitlab-shell 2017-12-14 16:00:04 +00:00
gitmodules_parser.rb
hook.rb
hooks_service.rb Fix the incorrect value being used to set GL_USERNAME on hooks 2017-10-25 14:01:57 -03:00
index.rb
lfs_changes.rb Gitlab::Git::RevList and LfsChanges use lazy popen 2017-11-06 10:20:14 +00:00
operation_service.rb Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly 2017-12-13 17:40:19 +01:00
path_helper.rb
popen.rb Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules 2017-11-06 21:44:57 +08:00
ref.rb
remote_repository.rb Remove Rugged::Repository#empty? 2017-12-07 15:33:30 +00:00
repository.rb Merge branch 'gitaly-conflict-resolver' into 'master' 2018-01-03 08:39:16 +00:00
repository_mirroring.rb Unify mirror addition operations to prepare for Gitaly migration 2017-12-06 19:08:29 -03:00
rev_list.rb Gitlab::Git::RevList and LfsChanges use lazy popen 2017-11-06 10:20:14 +00:00
storage.rb Keep track of all storage keys in a set 2017-12-01 17:50:43 +01:00
tag.rb
tree.rb
user.rb Fix encoding bugs in Gitlab::Git::User 2017-11-23 10:48:57 +00:00
util.rb
wiki.rb Resolve "Performance issues when loading large number of wiki pages" 2017-11-17 11:48:32 +00:00
wiki_file.rb Add path attribute to WikiFile class 2017-10-26 13:04:33 +02:00
wiki_page.rb
wiki_page_version.rb