kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2020-08-08 03:10:13 +00:00
parent 85f6cef972
commit bbd439f9c5
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/fix_notification_setting_group_dot.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix notification setting for group with dot in name
merge_request: 38773
author:
type: fixed

2
config/routes/profile.rb
View file

@ -22,7 +22,7 @@ resource :profile, only: [:show, :update] do
end
resource :notifications, only: [:show, :update] do
resources :groups, only: :update
resources :groups, only: :update, constraints: { id: Gitlab::PathRegex.full_namespace_route_regex }
end
resource :password, only: [:new, :create, :edit, :update] do

5
spec/routing/notifications_routing_spec.rb
View file

@ -10,4 +10,9 @@ RSpec.describe "notifications routing" do
it "routes to #update" do
expect(put("/profile/notifications")).to route_to("profiles/notifications#update")
end
it 'routes to group #update' do
expect(put("/profile/notifications/groups/gitlab-org")).to route_to("profiles/groups#update", id: 'gitlab-org')
expect(put("/profile/notifications/groups/gitlab.org")).to route_to("profiles/groups#update", id: 'gitlab.org')
end
end