Commit Graph

14 Commits

Author SHA1 Message Date
Robert Speicher 587242656f Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#rebase to Gitaly

Closes gitaly#863

See merge request gitlab-org/gitlab-ce!16259
2018-01-11 22:24:50 +00:00
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
Ahmad Sherif 42265d445f Migrate Gitlab::Git::Repository#rebase to Gitaly
Closes gitaly#863
2018-01-10 13:28:10 +01:00
Jacob Vosmaer 8cf0ea4469 Handle Gitaly aborted merge due to branch update 2018-01-03 12:02:37 +01:00
Alejandro Rodríguez 11247ac97c Move encoding methods to the more general EncodingHelper 2017-12-28 12:32:33 -03:00
Ahmad Sherif 887a373916 Migrate Gitlab::Git::Repository#revert to Gitaly
Closes gitaly#780
2017-12-05 14:09:15 +01:00
Ahmad Sherif 8be9567c64 Migrate Gitlab::Git::Repository#cherry_pick to Gitaly
Closes gitaly#737
2017-12-04 19:21:07 +01:00
Alejandro Rodríguez 37cc50f843 Incorporate Gitaly's OperationService.UserFFBranch RPC 2017-10-31 16:28:09 -03:00
Alejandro Rodríguez 4969f486f2 Support `Gitaly::User`'s gl_username field
We also unify conversions from and to `Gitaly::User`s in the
`Gitlab::Git::User` class.
2017-10-23 17:31:48 -03:00
Jacob Vosmaer 0aff29f96b Merge Merge Requests via Gitaly 2017-10-13 14:07:31 +02:00
Alejandro Rodríguez 79719cf003 Add OperationService.UserDeleteBranch Gitaly RPC 2017-10-03 21:06:34 -03:00
Alejandro Rodríguez fa5f0164eb Implement OperationService.UserAddBranch Gitaly RPC 2017-09-30 00:58:56 -03:00
Ahmad Sherif 4f5be9ec7b Migrate Gitlab::Git::Repository#add_tag to Gitaly
Closes gitaly#601
2017-09-29 00:53:49 +02:00
Ahmad Sherif 3944e16b4b Migrate Git::Repository#rm_tag to Gitaly
Closes gitaly#562
2017-09-28 23:36:40 +02:00