summaryrefslogtreecommitdiff
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-fix-cherry-pick' into 'master'Robert Speicher2017-03-031-0/+1
* Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-0/+3
|\
| * Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-0/+3
| |\
| | * Find .merge-request instead of sleep in MR search spec.25624-anticipate-obstacles-to-removing-turbolinksBryce Johnson2017-02-021-1/+3
| | * Remove turbolinks.Bryce Johnson2017-02-021-0/+1
* | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-035-34/+6
|\ \ \ | |/ /
| * | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-033-6/+6
| |/
| * Move Dashboard shortcuts specs from Spinah to RSpecmove-dashboard-shortcuts-from-spinach-to-rspecRémy Coutable2017-01-312-28/+0
* | Project#ensure_pipeline changed the args orderLin Jen-Shin2017-01-311-1/+1
* | Fix EE specs after ci_commit rename to pipelineKamil Trzcinski2017-01-311-6/+6
* | Fix adding pages domain to projects in groupsKamil Trzcinski2017-01-312-0/+15
* | Fix broken feature testsKamil Trzcinski2017-01-311-1/+1
* | Update commentsKamil Trzcinski2017-01-311-1/+1
* | Final fixesKamil Trzcinski2017-01-311-11/+11
* | Split PagesController into PagesController and PagesDomainsControllerKamil Trzcinski2017-01-311-1/+1
* | Added spinach testsKamil Trzcinski2017-01-312-0/+212
* | Add tests for Active TabKamil Trzcinski2017-01-312-0/+15
|/
* Added labels empty state and priority label empty state20852-getting-started-project-better-blank-state-for-labels-viewLuke "Jared" Bennett2017-01-301-5/+4
* Present TODO's list without grouping by projectOswaldo Ferreira2017-01-271-18/+27
* Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-261-4/+3
|\
| * Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-251-4/+3
* | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-2/+1
|/
* Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-205-12/+12
|\
| * Fixed more testsJose Ivan Vargas2017-01-182-7/+7
| * Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-183-5/+5
* | Merge branch '24032-changed-visibility-level-to-public-but-project-is-not-pub...Fatih Acet2017-01-191-1/+1
|\ \ | |/ |/|
| * Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-publicLuke "Jared" Bennett2016-12-101-1/+1
* | Remove repository trait from factories that don't need it in featuresrs-repository-project-traitRobert Speicher2017-01-178-13/+13
* | Add the `:repository` trait to `:project` factories in Cucumber stepsRobert Speicher2017-01-1719-33/+33
* | Merge branch 'move-admin-groups-spinach-test-to-rspec' into 'master' Rémy Coutable2017-01-153-196/+0
|\ \
| * | Move admin groups spinach tests to rspecSemyon Pupkov2016-12-273-196/+0
* | | Merge branch 'move-dashboard-help-spinach-to-rspec' into 'master' Rémy Coutable2017-01-132-30/+0
|\ \ \
| * | | Move dashboard help spinach test to rspecSemyon Pupkov2017-01-042-30/+0
* | | | Merge branch 'move-dashboard-group-spinach-to-rspec' into 'master' Rémy Coutable2017-01-132-38/+0
|\ \ \ \
| * | | | Move dashboard group spinach test to rspecSemyon Pupkov2017-01-042-38/+0
| |/ / /
* | | | Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master' Rémy Coutable2017-01-132-43/+0
|\ \ \ \
| * | | | Move dashboard archived projects spinach tests to rspecSemyon Pupkov2017-01-042-43/+0
| |/ / /
* | | | Merge branch 'move-dashboard-activetab-spinach-to-rspec' into 'master' Rémy Coutable2017-01-132-29/+0
|\ \ \ \
| * | | | Move dashboard active tab spinach test to rspecSemyon Pupkov2017-01-032-29/+0
| |/ / /
* | | | Merge branch 'move-admin-users-spinach-tests-to-rspec' into 'master' Rémy Coutable2017-01-132-232/+0
|\ \ \ \
| * | | | Move admin users spinach tests to rspecSemyon Pupkov2017-01-022-232/+0
| |/ / /
* | | | Fix spinach testsClement Ho2017-01-092-84/+0
* | | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-061-2/+4
|\ \ \ \
| * | | | Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-031-2/+4
| |/ / /
* | | | Move admin deploy keys spinach to rspecSemyon Pupkov2017-01-032-82/+0
|/ / /
* | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-272-0/+82
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-2020-786/+13
| |\ \
| * \ \ Merge CSSFilipa Lacerda2016-12-127-47/+13
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0616-135/+33
| |\ \ \
| * | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-222-2/+22