diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-06-28 13:55:10 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-06-28 13:55:10 +0300 |
| commit | e17edd37ab3a33d874d6ad7af92f0f5045d970c7 (patch) | |
| tree | 3665d4846b9aa27bc12e22f9c50db72845187554 /.gitlab | |
| parent | 5ee5b280b05f63768f359d0b82d5edd490c0e7cd (diff) | |
| parent | 2b4d755df14871a3b77bbfc219d6dd350dbc7667 (diff) | |
Merge branch '3264-project-aliases-ce' into 'master'
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14108
See merge request gitlab-org/gitlab-ce!29604
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/CODEOWNERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 0ca6d7a350a..f65e62068d6 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -19,3 +19,5 @@ db/ @abrandl @NikolayS /lib/gitlab/ci/templates/ @nolith @zj /lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @DylanGriffith @mayra-cabrera @tkuah /lib/gitlab/ci/templates/Security/ @plafoucriere @gonzoyumo @twoodham +/ee/app/models/project_alias.rb @patrickbajao +/ee/lib/api/project_aliases.rb @patrickbajao |