diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-07 17:04:54 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-07 17:04:54 +0000 |
| commit | 030b5038b1ba84fb5570f064d53ee9b1328e43ea (patch) | |
| tree | 3345aba31cdc50bb1ab77b2bbdf66896b39facfe /spec/controllers | |
| parent | 92c33a8e7121e67aa0be7cd95f578b0f8dcfdfcb (diff) | |
| parent | 7f63a8787ce454a61f72393ccbe22fc283ba8313 (diff) | |
| download | gitlab-ce-030b5038b1ba84fb5570f064d53ee9b1328e43ea.tar.gz | |
Merge branch 'cleanup-ci-pages' into 'master'
Cleanup CI pages
- [x] Remove `ci/projects/:id` page
- [x] Remove Continuous integration from project menu
- [x] Remove unused css/js
- [x] Remove Ci::Commit and Ci::Build controllers
- [x] Move CI services to project settings area
cc @ayufan
Part of #2594
See merge request !1529
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/ci/commits_controller_spec.rb | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/spec/controllers/ci/commits_controller_spec.rb b/spec/controllers/ci/commits_controller_spec.rb deleted file mode 100644 index cc39ce7687c..00000000000 --- a/spec/controllers/ci/commits_controller_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require "spec_helper" - -describe Ci::CommitsController do - describe "GET /status" do - it "returns status of commit" do - commit = FactoryGirl.create :ci_commit - get :status, id: commit.sha, ref_id: commit.ref, project_id: commit.project.id - - expect(response).to be_success - expect(response.code).to eq('200') - JSON.parse(response.body)["status"] == "pending" - end - - it "returns not_found status" do - commit = FactoryGirl.create :ci_commit - get :status, id: commit.sha, ref_id: "deploy", project_id: commit.project.id - - expect(response).to be_success - expect(response.code).to eq('200') - JSON.parse(response.body)["status"] == "not_found" - end - end -end |
