summaryrefslogtreecommitdiff
path: root/spec/factories
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '...Douwe Maan2017-02-151-2/+5
* Merge 'dev/8-17-stable' into 8-17-stableRuben Davila2017-02-141-1/+5
|\
| * Merge branch 'svg-xss-fix' into 'security' Robert Speicher2017-02-131-1/+5
* | Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-141-0/+8
|/
* Use normal associations instead of polymorphic.Ruben Davila2017-02-071-1/+1
* Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan2017-02-061-0/+153
|\
| * Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-063-7/+12
| |\
| * \ Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-031-0/+36
| |\ \
| * | | Update commentsKamil Trzcinski2017-01-311-4/+2
| * | | Verify trusted certificate chainKamil Trzcinski2017-01-311-1/+77
| * | | Pages domain model specsKamil Trzcinski2017-01-311-0/+79
* | | | Add traits for ProjectFeatures to Project factorySemyon Pupkov2017-02-051-0/+19
| |_|/ |/| |
* | | Merge branch 'rs-event-traits' into 'master' Rémy Coutable2017-02-031-0/+12
|\ \ \
| * | | Add traits for the different Event types to the Event factoryrs-event-traitsRobert Speicher2017-02-011-0/+12
| |/ /
* | | Remove backlog lists from factoriesDouglas Barbosa Alexandre2017-02-032-7/+0
| |/ |/|
* | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-021-0/+6
|\ \ | |/
| * Merge branch '27044-fix-explore-sorting-on-trending' into 'master' Fatih Acet2017-01-261-0/+6
| |\
| | * Fix /explore sorting (trending)Eric Eastwood2017-01-261-0/+6
* | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2615-17/+25
|\ \ \ | |/ /
| * | Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-2615-17/+25
| |\ \
| | * | Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-252-3/+10
| | * | Factories with a project association use `:empty_project` by defaultRobert Speicher2017-01-2414-14/+15
* | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-268-2/+47
|\ \ \ \ | |/ / /
| * | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-252-1/+6
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-241-1/+2
| | |\ \ | | | |/
| | * | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-202-1/+6
| * | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-251-0/+6
| |\ \ \ | | |_|/ | |/| |
| | * | Support notes without projectJarka Kadlecova2017-01-181-0/+6
| * | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-231-1/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Pass memoizable warnings attribute to stage objectGrzegorz Bizon2017-01-181-1/+2
| * | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern2017-01-191-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Notify the user who set auto-merge when merge conflict occurstwonegatives2017-01-141-0/+4
| * | | Merge branch 'rs-repository-project-trait' into 'master' Rémy Coutable2017-01-181-0/+4
| |\ \ \
| | * | | Add a `:repository` trait to the `:empty_project` factoryRobert Speicher2017-01-171-0/+4
| * | | | Backport backend work for time tracking.Ruben Davila2017-01-151-0/+9
| |/ / /
| * | | Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master' Rémy Coutable2017-01-131-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Move dashboard archived projects spinach tests to rspecSemyon Pupkov2017-01-041-0/+4
| * | | Add test example for pipeline with yaml errorsGrzegorz Bizon2017-01-041-0/+4
| * | | fix pipelines/index.html.haml merge conflictRegis2017-01-022-1/+7
| |\ \ \ | | |/ /
| * | | Add missing specs for new methods in pipeline classGrzegorz Bizon2016-12-271-0/+4
| * | | merge master and fix application.rb conflictRegis2016-12-231-0/+1
| |\ \ \
| * | | | Add specs for pipeline entity and improve factoryGrzegorz Bizon2016-12-211-0/+4
* | | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-048-6/+46
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-262-1/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add more storage statisticsMarkus Koller2016-12-212-1/+7
| | |/ /
| * | | Fix viewing "build failed" TODOsNick Thomas2016-12-221-0/+1
| |/ /
| * | Add terminal UI and controller actionsFatih Acet2016-12-191-3/+7
| * | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-191-1/+1
| * | Merge branch 'master' into fix-yaml-variablesLin Jen-Shin2016-12-193-1/+15
| |\ \ | | |/
| | * Add a `scopes` column to the `personal_access_tokens` tableTimothy Andrew2016-12-161-0/+1