summaryrefslogtreecommitdiff
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2018-01-049-20/+22
|\
| * Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ...Rémy Coutable2017-12-238-20/+19
| |\
| | * Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-228-20/+19
| * | Disable /dev/shm in CIsh-disable-dev-shmStan Hu2017-12-221-0/+3
| |/
* | Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2017-12-221-11/+0
|\ \ | |/
| * Remove two unused step definitions from spinachNick Thomas2017-12-201-11/+0
* | Fix broken spinach testFilipa Lacerda2017-12-211-1/+1
|/
* Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-151-2/+2
|\
| * Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-155-14/+34
| |\
| * | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-221-2/+2
| * | Updates based on feedbackLin Jen-Shin2017-11-221-2/+2
| * | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-171-1/+1
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0625-1348/+169
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-255-417/+1
| |\ \ \ \
| * | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-181-2/+2
* | | | | | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-141-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'add-js-prefix-issuable-edit' into 'master'Filipa Lacerda2017-12-121-1/+1
|\ \ \ \ \
| * | | | | Add js prefix for issuable-editadd-js-prefix-issuable-editClement Ho2017-12-081-1/+1
* | | | | | Fix specs after removing assignee_id fieldValery Sizov2017-12-111-1/+1
|/ / / / /
* | | | | Rename artifacts_* to legacy_artifacts_*Kamil Trzcinski2017-12-032-4/+4
* | | | | add logging back to capybara config and clean up selenium option instantiationclean-capybara-configMike Greiling2017-11-291-8/+28
| |_|_|/ |/| | |
* | | | Use #query_scope instead of #parent in a Spinach featureRémy Coutable2017-11-141-1/+1
| |_|/ |/| |
* | | enable CHROME_HEADLESS environment variable for Spinach tests similar to RSpecMike Greiling2017-11-011-1/+4
* | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-311-2/+4
|\ \ \
| * | | Load participants asyncEric Eastwood2017-10-311-2/+4
* | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-234-20/+14
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/reliable-rspec-with-eval-script' into 'master'Rémy Coutable2017-10-202-19/+1
| |\ \ \
| | * | | Check for element before evaluate_scriptEric Eastwood2017-10-192-19/+1
| * | | | Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-1/+1
| |\ \ \ \
| | * | | | Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-1/+1
| * | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-171-0/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix spinach featuresBob Van Landuyt2017-10-111-0/+12
* | | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-124-320/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Replace the 'features/explore/projects.feature' spinach test with an rspec an...replace_explore_projects.featureVitaliy @blackst0ne Klachkov2017-10-114-320/+0
| |/ / / /
* | | | | fix spinach test for branch validationMike Greiling2017-10-121-0/+1
* | | | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-093-4/+7
|\ \ \ \ \ | |/ / / /
| * | | | Add a project forks spec helperBob Van Landuyt2017-10-073-4/+7
* | | | | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-10-063-956/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'replace_project_merge_requests.feature' into 'master'Rémy Coutable2017-10-062-956/+0
| |\ \ \ \
| | * | | | Replace the 'project/merge_requests.feature' spinach test with an rspec analogreplace_project_merge_requests.featureVitaliy @blackst0ne Klachkov2017-10-052-956/+0
| | |/ / /
| * | | | Merge branch 'fork-layout-cleanup' into 'master'Filipa Lacerda2017-10-041-1/+1
| |\ \ \ \
| | * | | | fixed specsfork-layout-cleanupPhil Hughes2017-10-021-1/+1
| | |/ / /
* | | | | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-10-033-0/+90
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'dm-copy-parallel-diff' into 'master'Phil Hughes2017-10-031-1/+1
| |\ \ \ \
| | * | | | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-021-1/+1
| | |/ / /
| * | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2610-444/+24
| |\ \ \ \ | | |/ / /
| * | | | Port fast-foward spinach specs from EEEric Eastwood2017-09-192-0/+89
| | |/ / | |/| |
* | | | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-09-2610-444/+24
|\ \ \ \ | | |/ / | |/| |
| * | | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-235-27/+23
| | |/ | |/|
| * | Merge branch 'replace_project_shortcuts.feature' into 'master'Rémy Coutable2017-09-222-105/+0
| |\ \