diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-30 12:35:40 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-30 12:35:40 +0400 |
| commit | f438bd415ffc4405c2e81360a92ffaf907cd87ad (patch) | |
| tree | 6543a5114236effcba0dc3f4ac307b7d33d65cc3 /spec/routing | |
| parent | 0904cc485c23385e4ac0628ddce5e1c842909af4 (diff) | |
| parent | d9c02f30e56592986b98bcbf8e7c1abd712b696f (diff) | |
Merge branch 'master' into 6-0-dev
Conflicts:
app/controllers/admin/teams/projects_controller.rb
app/views/team_members/_team_member.html.haml
app/views/teams/members/_member.html.haml
Diffstat (limited to 'spec/routing')
| -rw-r--r-- | spec/routing/project_routing_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index 2a1f780f0f4..35de757b18b 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -237,7 +237,7 @@ end # project_snippet GET /:project_id/snippets/:id(.:format) snippets#show # PUT /:project_id/snippets/:id(.:format) snippets#update # DELETE /:project_id/snippets/:id(.:format) snippets#destroy -describe Project::SnippetsController, "routing" do +describe Projects::SnippetsController, "routing" do it "to #raw" do get("/gitlabhq/snippets/1/raw").should route_to('projects/snippets#raw', project_id: 'gitlabhq', id: '1') end |