diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-13 09:07:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-13 09:07:16 +0000 |
| commit | 3101940724e516c36eb67884bd4f944b63d20721 (patch) | |
| tree | 01c434907c8344df72e4314bb8c8f60a0b97c0f3 /config | |
| parent | 7f376fe105b7930f961e4dc1ab5a09e1118de181 (diff) | |
| download | gitlab-ce-3101940724e516c36eb67884bd4f944b63d20721.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/achievements.yml | 8 | ||||
| -rw-r--r-- | config/routes/uploads.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/feature_flags/development/achievements.yml b/config/feature_flags/development/achievements.yml new file mode 100644 index 00000000000..853a8133351 --- /dev/null +++ b/config/feature_flags/development/achievements.yml @@ -0,0 +1,8 @@ +--- +name: achievements +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106909 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386817 +milestone: '15.8' +type: development +group: group::organization +default_enabled: false diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb index ff4c11e805a..52c67a705dc 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -4,7 +4,7 @@ scope path: :uploads do # Note attachments and User/Group/Project/Topic avatars get "-/system/:model/:mounted_as/:id/:filename", to: "uploads#show", - constraints: { model: %r{note|user|group|project|projects\/topic}, mounted_as: /avatar|attachment/, filename: %r{[^/]+} } + constraints: { model: %r{note|user|group|project|projects\/topic|achievements\/achievement}, mounted_as: /avatar|attachment/, filename: %r{[^/]+} } # show uploads for models, snippets (notes) available for now get '-/system/:model/:id/:secret/:filename', |