diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 12:45:37 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 12:45:37 -0600 |
| commit | a0c0ea655a8659bb1388a6ffc6738754c1c0f9bd (patch) | |
| tree | bdf8ca27712e033802868fc09533381484f641ae /lib/api/helpers/internal_helpers.rb | |
| parent | 48c78958e31c666fcba0b253104d47be5b3c82b0 (diff) | |
| parent | 8900b23eab6abd5a6c01278fa0da18d5bed98491 (diff) | |
| download | gitlab-ce-axios-profile.tar.gz | |
Merge branch 'master' into axios-profileaxios-profile
Diffstat (limited to 'lib/api/helpers/internal_helpers.rb')
| -rw-r--r-- | lib/api/helpers/internal_helpers.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index eb67de81a0d..cd59da6fc70 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -60,8 +60,20 @@ module API false end + def project_path + project&.path || project_path_match[:project_path] + end + + def namespace_path + project&.namespace&.full_path || project_path_match[:namespace_path] + end + private + def project_path_match + @project_path_match ||= params[:project].match(Gitlab::PathRegex.full_project_git_path_regex) || {} + end + # rubocop:disable Gitlab/ModuleWithInstanceVariables def set_project if params[:gl_repository] |