diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-30 23:31:42 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-30 23:31:42 +0000 |
| commit | 120c79020ddd3097ae64149c75864353276aaa5f (patch) | |
| tree | 0db7805385712d1aa479b343acedeec90c755ba9 /spec/controllers/groups_controller_spec.rb | |
| parent | e47b7a286d7063933c14ebf202e7d0a2b8858335 (diff) | |
| parent | 5aeb5ff51e8d25791c400301a627932e2f4091e8 (diff) | |
| download | gitlab-ce-120c79020ddd3097ae64149c75864353276aaa5f.tar.gz | |
Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into 'master'42613-clean-up-old-project-permissions-frontend-code42242-clean-up-error-handling-in-project-permissions-page
Add support for PreReceiveError in UserMergeBranch RPC
Closes gitaly#979
See merge request gitlab-org/gitlab-ce!16765
Diffstat (limited to 'spec/controllers/groups_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions