diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-09-18 11:54:06 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-09-18 11:54:06 +0300 |
| commit | 3984818bb37ca8da8fdc7fb5e61f7cfc0a329ac4 (patch) | |
| tree | 8970a0f54e8841dbe2f79960e229f3d4a129afd9 /spec/controllers | |
| parent | 0aec0d53b10078613b66b0d41424ee4264ae6406 (diff) | |
| parent | b7e49d8042629dd0e5b9feade78e058a737f96b2 (diff) | |
Merge branch 'ci_projects_order' into 'master'
Fix: ci projects order
https://gitlab.com/gitlab-org/gitlab-ce/issues/2553
See merge request !1333
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/ci/projects_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/ci/projects_controller_spec.rb b/spec/controllers/ci/projects_controller_spec.rb index 015788a05e1..c7a3cd50c20 100644 --- a/spec/controllers/ci/projects_controller_spec.rb +++ b/spec/controllers/ci/projects_controller_spec.rb @@ -84,7 +84,7 @@ describe Ci::ProjectsController do end it "searches projects" do - xhr :get, :gitlab, { search: "str", format: "js" }.with_indifferent_access + xhr :get, :index, { search: "str", format: "json" }.with_indifferent_access expect(response).to be_success expect(response.code).to eq('200') |