diff options
| author | Drew Blessing <drew@blessing.io> | 2016-01-08 15:52:05 +0000 |
|---|---|---|
| committer | Drew Blessing <drew@blessing.io> | 2016-01-08 15:52:05 +0000 |
| commit | c1e974ed889dd31fbbddfa2daeb1a681043d5aa0 (patch) | |
| tree | f18f39a74c7af8be6e7ed9ea8a4caac9b21c969c /spec/routing | |
| parent | 255a63564bcb0cf3125be1fbcfe0d9c269e513cf (diff) | |
| parent | 0b2fa3bfa4bea00973ad6b8c3dfb8302d84fe4de (diff) | |
| download | gitlab-ce-c1e974ed889dd31fbbddfa2daeb1a681043d5aa0.tar.gz | |
Merge branch 'issue_3076' into 'master'
Fix problem with projects ending with .keys #3076
Closes #3076
Move route `:username.keys` below project's routes. This allow project's to handle names ending with `.keys`
See merge request !1883
Diffstat (limited to 'spec/routing')
| -rw-r--r-- | spec/routing/project_routing_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index 2a70c190337..22ba25217f0 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -80,6 +80,7 @@ describe ProjectsController, 'routing' do it 'to #show' do expect(get('/gitlab/gitlabhq')).to route_to('projects#show', namespace_id: 'gitlab', id: 'gitlabhq') + expect(get('/gitlab/gitlabhq.keys')).to route_to('projects#show', namespace_id: 'gitlab', id: 'gitlabhq.keys') end it 'to #update' do |