summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Ensure raise_error expectations provide argumentsrs-fix-spec-warningsRobert Speicher2015-09-212-2/+4
|
* Merge branch 'jwt' into 'master' Douwe Maan2015-09-201-3/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed format validation **What does this MR do?** Removals format validation for drone token **Are there points in the code the reviewer needs to double check?** Nothing **Why was this MR needed?** because drone migrated to JWT tokens and JWT token doesn't valid with current format ( i don't know how many symbols JWT can use for this ) See merge request !1359
| * Removed format validationKirilll Zaitsev2015-09-191-3/+0
| |
* | Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-191-1/+1
|/
* remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-33/+4
|
* Fix CI status in the MR pageValery Sizov2015-09-182-22/+5
|
* add repository field to issue hook dataJungkook Park2015-09-171-0/+16
| | | | | | add a test for to_hook_data of issue model update CHANGELOG
* Make rubocop happyKamil Trzcinski2015-09-161-1/+1
|
* Fix CI testsKamil Trzcinski2015-09-161-2/+2
|
* Fix ordering issueKamil Trzcinski2015-09-161-0/+18
|
* Fix: models/ci/project_spec.rb once againKamil Trzcinski2015-09-151-1/+1
|
* Fix models/ci/mail_service_spec.rbKamil Trzcinski2015-09-151-10/+10
| | | | | - Change Notify to Ci::Notify - Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
* Revert "Fix: models/ci/mail_service_spec.rb"Kamil Trzcinski2015-09-151-18/+33
| | | | | | This reverts commit 345ff6cbf93eca5d61218f28d5f4d9eb2d4abf67. This requires sidekiq >= 3.4 and fixed all other CE tests
* Fix: models/ci/project_spec.rb once againKamil Trzcinski2015-09-151-2/+2
|
* Fix models/ci/web_hook_spec.rbKamil Trzcinski2015-09-151-1/+1
|
* Fix: models/ci/project_spec.rbKamil Trzcinski2015-09-151-11/+7
|
* Fix: models/ci/mail_service_spec.rbKamil Trzcinski2015-09-151-33/+18
|
* Fix: models/ci/build_spec.rbKamil Trzcinski2015-09-151-1/+1
|
* fix specs. Stage 7Valery Sizov2015-09-155-8/+8
|
* fix specs. Stage 6Valery Sizov2015-09-151-2/+2
|
* fix specs. Stage 5Valery Sizov2015-09-154-9/+6
|
* rubocop satisfyValery Sizov2015-09-143-29/+29
|
* Remove network from CIDmitriy Zaporozhets2015-09-111-54/+0
|
* Fix more testsDmitriy Zaporozhets2015-09-105-63/+13
|
* Fix most of project specsDmitriy Zaporozhets2015-09-101-8/+8
|
* Fix commit specsDmitriy Zaporozhets2015-09-1015-246/+250
|
* Fix some issues with ci models specsDmitriy Zaporozhets2015-09-106-50/+50
|
* integration with gitlab authValery Sizov2015-09-091-50/+0
|
* Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-097-69/+188
|\
| * Re-annotate modelsStan Hu2015-09-066-69/+81
| |
| * Drone CI serviceKirilll Zaitsev2015-09-021-0/+107
| |
* | Refactor CI testsDmitriy Zaporozhets2015-09-0916-0/+1688
|/
* Merge branch 'hide-recent-push' into 'master'Dmitriy Zaporozhets2015-08-211-0/+29
|\ | | | | | | | | | | | | | | Only show recent push event if the branch still exists or a recent merge request has not been created Closes #2277 See merge request !1167
| * Only show recent push event if the branch still exists or a recent merge ↵Stan Hu2015-08-201-0/+29
| | | | | | | | | | | | request has not been created Closes #2277
* | Case-insensetive search for commentscomment-case-insensetive-searchDmitriy Zaporozhets2015-08-191-0/+6
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-174-4/+46
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update Flowdock integration to support new Flowdock APIBoyan Tabakov2015-08-141-4/+8
| | | | | | | | Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
| * Merge branch 'improve-hipchat-service-test' into 'master'Dmitriy Zaporozhets2015-08-132-0/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide more feedback what went wrong if HipChat service failed test This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks. Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/10f82eb02db138f9680e69cdb3d3ed82/image.png) Issue gitlab-com/support-forum#213 See merge request !1144
| | * Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-122-0/+18
| | | | | | | | | | | | Issue gitlab-com/support-forum#213
| * | Add merged label on branches pageFlorent (HP)2015-08-111-0/+20
| |/
* | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-114-3/+16
|/ | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-111-14/+0
| | | | | | | This reverts commit 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a, reversing changes made to 804168e1def1204af712febb229f41a3865f085f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-114-4/+5
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-072-5/+5
| | | | Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
* Merge branch 'report-spam'Dmitriy Zaporozhets2015-08-061-0/+7
|\
| * Allow users to send abuse reportsDmitriy Zaporozhets2015-08-061-0/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-061-0/+7
|\ \ | |/ |/| | | | | | | | | | | | | | | Only publish ssh key-type and key Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys) To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded. See merge request !850
| * Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-041-0/+7
| |
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-054-5/+4
|\ \
| * | Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-041-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>