diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-02 11:47:09 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-02 11:47:09 +0300 |
| commit | ee890f2b2a66be925746f2238dc462a74b0fd219 (patch) | |
| tree | bb2e74eb834d5c69f66e42c7a80af1705e616ea9 /spec/routing | |
| parent | f49fb5dca1ecf2b1ae6415920de09b4d95c14bb1 (diff) | |
| parent | 7588186e8173f53a7f9b86d2b6959d7f94a3caac (diff) | |
| download | gitlab-ce-ee890f2b2a66be925746f2238dc462a74b0fd219.tar.gz | |
Merge branch 'master' into 6-0-dev
Conflicts:
app/views/dashboard/projects.html.haml
app/views/layouts/_head_panel.html.haml
config/routes.rb
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 35de757b18b..831e464f9cb 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 Projects::SnippetsController, "routing" do +describe SnippetsController, "routing" do it "to #raw" do get("/gitlabhq/snippets/1/raw").should route_to('projects/snippets#raw', project_id: 'gitlabhq', id: '1') end |