summaryrefslogtreecommitdiff
path: root/spec/factories
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-12-156-82/+6
|\
| * Migrate CI::Project to ProjectKamil Trzcinski2015-12-115-76/+6
| * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-101-6/+0
* | Merge branch 'master' into ee_masterValery Sizov2015-12-143-12/+18
|\ \ | |/
| * Merge branch 'master' into merge-if-greenDouwe Maan2015-12-094-0/+25
| |\
| * | Incorporate feedbackZeger-Jan van de Weg2015-12-051-0/+5
| * | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-022-12/+13
* | | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-094-0/+25
|\ \ \ | | |/ | |/|
| * | Update annotationsStan Hu2015-12-084-0/+25
| |/
* | Merge remote-tracking branch 'origin/master' into ce-to-eece-to-eeValery Sizov2015-11-162-0/+20
|\ \ | |/
| * Add support for git lfs.lfsMarin Jankovski2015-11-162-0/+20
* | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-154-4/+22
|\ \ | |/
| * Merge branch 'annotate-models' into 'master' Dmitriy Zaporozhets2015-11-143-0/+14
| |\
| | * Annotate modelsDmitriy Zaporozhets2015-11-133-0/+14
| * | Expose CI enable option in project featuresKamil Trzcinski2015-11-131-4/+8
| |/
* | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-132-0/+11
|\ \ | |/
| * Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-101-0/+9
| |\
| | * Add tests to release notes featureDmitriy Zaporozhets2015-11-061-3/+3
| | * Add release modelDmitriy Zaporozhets2015-11-051-0/+9
| * | Fix testsshared_runnersKamil Trzcinski2015-11-081-0/+2
| |/
* | When someone as marked as a required approver for a merge request, an email s...Valery Sizov2015-10-302-0/+15
* | Merge remote-tracking branch 'origin/master' into ce_upstream_15_10Valery Sizov2015-10-154-54/+38
|\ \ | |/
| * Implement Commit Status APIKamil Trzcinski2015-10-122-0/+16
| * Make rubocop happyKamil Trzcinski2015-10-051-2/+2
| * Fix rest of testsKamil Trzcinski2015-10-051-0/+1
| * Fix next round of testsKamil Trzcinski2015-10-051-2/+2
| * Make commit_spec runKamil Trzcinski2015-10-051-5/+11
| * Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-052-38/+9
| * Delegate ci_project parameters to projectsKamil Trzcinski2015-09-301-12/+0
| * WIPKamil Trzcinski2015-09-292-1/+3
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-09-229-0/+287
|\ \ | |/
| * Refactor ci_admin_event and fix features/ci/events_spec.rbKamil Trzcinski2015-09-151-1/+1
| * Fix: ci_*_build factory should be validKamil Trzcinski2015-09-151-0/+2
| * rubocop satisfyValery Sizov2015-09-141-2/+2
| * Fix build features specsDmitriy Zaporozhets2015-09-111-1/+1
| * Fix most of project specsDmitriy Zaporozhets2015-09-101-2/+2
| * Fix commit specsDmitriy Zaporozhets2015-09-102-2/+2
| * Fix some issues with ci models specsDmitriy Zaporozhets2015-09-101-2/+2
| * Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-093-0/+14
| |\
| * | Refactor CI testsDmitriy Zaporozhets2015-09-092-3/+3
| * | Merge CI factories and CI spec/support with GitLabDmitriy Zaporozhets2015-09-099-0/+285
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-09-163-0/+14
|\ \ \ | | |/ | |/|
| * | Re-annotate modelsStan Hu2015-09-063-0/+14
| |/
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-08-102-1/+11
|\ \ | |/
| * Allow users to send abuse reportsDmitriy Zaporozhets2015-08-061-0/+9
| * Re-annotate modelsAtsushi Ishida2015-08-031-1/+2
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-07-021-1/+1
|\ \ | |/
| * Fix Style/AsciiComments cop violationRobert Speicher2015-06-221-1/+1
* | Rename approve->approval. Add approval count to projectDmitriy Zaporozhets2015-06-091-1/+1
* | Explicitly say approve class name in associationDmitriy Zaporozhets2015-06-091-1/+1