summaryrefslogtreecommitdiff
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'approval-integration' into 'master' Jacob Schatz2017-01-182-6/+15
|\
| * Merge remote-tracking branch 'origin/master' into approval-integrationSean McGivern2017-01-174-209/+0
| |\
| * \ Merge branch 'master' into approval-integrationSean McGivern2017-01-1612-473/+0
| |\ \
| * \ \ Merge branch 'master' into approval-integrationBryce Johnson2017-01-1126-870/+18
| |\ \ \
| * | | | Re-add tests for Accept Merge Request button.Bryce Johnson2016-12-212-0/+8
| * | | | Enable JavaScript for Approval Spinach specs.Bryce Johnson2016-12-212-1/+2
| * | | | Remove unused spec for merge button disabled.viBryce Johnson2016-12-211-0/+2
| * | | | Remove unused spec for merge button disabled.Bryce Johnson2016-12-211-7/+0
| * | | | Remove spec for merge button hidden, as it shouldn't be.Bryce Johnson2016-12-211-2/+0
| * | | | Remove spinach from teeth.Bryce Johnson2016-12-201-1/+1
| * | | | Properly enable/disable merge button, fix tests.Bryce Johnson2016-12-202-3/+10
| * | | | Fix build errors related to CI JavaScript.Bryce Johnson2016-12-201-4/+4
* | | | | Remove repository trait from factories that don't need it in featuresRobert Speicher2017-01-178-13/+13
* | | | | Add the `:repository` trait to `:project` factories in Cucumber stepsRobert Speicher2017-01-1719-33/+33
| |_|_|/ |/| | |
* | | | Remove features/admin/settings.featureRémy Coutable2017-01-161-13/+0
* | | | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-eeJames Lopez2017-01-163-196/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 remote-tracking branch 'gitlab-ce/master' into ce-to-eeJames Lopez2017-01-1312-473/+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
* | | | | fix failing spinach due to !8010Mike Greiling2017-01-091-1/+1
* | | | | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-eeJames Lopez2017-01-093-84/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-12-292-0/+82
|\ \ \ \ | |/ / /
| * | | 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
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-12-222-11/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Changes after reviewFilipa Lacerda2016-12-212-11/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-12-214-159/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-202-151/+0
| |\ \ \ \ \
| | * | | | | Move admin projects spinach tests to rspecSemyon Pupkov2016-12-192-151/+0
| * | | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-202-8/+8
| |\ \ \ \ \ \
| | * | | | | | Fix specszj-kamil-slack-slash-commandsKamil Trzcinski2016-12-192-6/+6
| | * | | | | | Improve after feedbackKamil Trzcinski2016-12-192-7/+7
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-12-2011-506/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /