summaryrefslogtreecommitdiff
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/ldap-group-filter' into 'master'Douwe Maan2017-09-281-1/+1
|\
| * more specs and fixesJames Lopez2017-09-261-1/+1
* | Merge remote-tracking branch 'upstream/master' into ce-to-eeNick Thomas2017-09-255-27/+23
|\ \
| * | Improve list of sorting optionsblackst0ne2017-09-255-27/+23
| |/
* | Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-09-252-105/+0
|\ \ | |/ |/|
| * Merge branch 'replace_project_shortcuts.feature' into 'master'Rémy Coutable2017-09-222-105/+0
| |\
| | * Replace the 'project/shortcuts.feature' spinach test with an rspec analogreplace_project_shortcuts.featureVitaliy @blackst0ne Klachkov2017-09-222-105/+0
* | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-22Lin Jen-Shin2017-09-223-312/+1
|\ \ \ | |/ /
| * | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-221-1/+1
| |\ \
| | * | Add view replaced file link for image diffsadd-view-replaced-file-linkClement Ho2017-09-201-1/+1
| | |/
| * | Replace the 'project/service.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-222-311/+0
| |/
* | Remove unneeded feature filesRémy Coutable2017-09-192-217/+0
* | Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-09-186-274/+0
|\ \ | |/
| * Merge branch 'replace_project_snippets.feature' into 'master'Rémy Coutable2017-09-182-135/+0
| |\
| | * Replace the 'project/snippets.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-182-135/+0
| * | Merge branch 'replace_project_commits_revert.feature' into 'master'Rémy Coutable2017-09-182-73/+0
| |\ \
| | * | Replace the 'project/commits/revert.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-182-73/+0
| | |/
| * | Merge branch 'replace_project_archived.feature' into 'master'Rémy Coutable2017-09-182-66/+0
| |\ \
| | * | Replace the 'project/archived.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-172-66/+0
| | |/
| * | Replace the 'search.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-162-216/+0
| |/
* | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-13Rémy Coutable2017-09-1320-1075/+0
|\ \ | |/
| * Replace the 'profile/active_tab.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-132-54/+0
| * Merge branch 'replace_project_issues_award_emoji.feature' into 'master'Rémy Coutable2017-09-122-152/+0
| |\
| | * Replace the 'project/issues/award_emoji.feature' spinach test with an rspec a...Vitaliy @blackst0ne Klachkov2017-09-122-152/+0
| * | Replace the 'project/builds/summary.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-122-73/+0
| |/
| * Merge branch 'replace_project_merge_requests_revert.feature' into 'master'Rémy Coutable2017-09-122-85/+0
| |\
| | * Replace the 'project/merge_requests/revert.feature' spinach test with an rspe...Vitaliy @blackst0ne Klachkov2017-09-122-85/+0
| * | Merge branch 'replace_milestone.feature' into 'master'Rémy Coutable2017-09-122-78/+0
| |\ \ | | |/ | |/|
| | * Replace the project/milestone.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-122-78/+0
| * | Merge branch 'replace_project_merge_requests_accept.feature' into 'master'Rémy Coutable2017-09-112-83/+0
| |\ \
| | * | Replace the 'project/merge_requests/accept.feature' spinach test with an rspe...blackst0ne2017-09-112-83/+0
| | |/
| * | Merge branch 'replace_spinach_wiki.feature' into 'master'Rémy Coutable2017-09-112-296/+0
| |\ \
| | * | Replace 'project/wiki.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-112-296/+0
| | |/
| * | Merge branch 'replace_group_links.feature' into 'master'Rémy Coutable2017-09-112-67/+0
| |\ \
| | * | Replace project/group_links.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-102-67/+0
| | |/
| * | Merge branch 'replace_emails.feature' into 'master'Rémy Coutable2017-09-112-74/+0
| |\ \
| | * | Replace the profile/emails.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-102-74/+0
| | |/
| * | Replace the project/team_management.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-102-113/+0
| |/
* | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-08Lin Jen-Shin2017-09-083-9/+7
|\ \ | |/
| * Resolve "Make project and features visibility settings less confusing"Mike Greiling2017-09-072-2/+1
| * Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-071-1/+1
| |\
| | * Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-071-1/+1
| * | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-071-9/+4
| |\ \
| | * | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-061-9/+4
| | |/
| * | Merge branch 'fly-out-top-level-item' into 'master'Filipa Lacerda2017-09-073-4/+4
| |\ \
| | * | fixed spinach specsfly-out-top-level-itemPhil Hughes2017-09-061-1/+1
| | * | spec fixesPhil Hughes2017-09-061-1/+1
| | * | Add top level items to fly-out navigationPhil Hughes2017-09-063-5/+5
| | |/
| * | fixed new issue button not being clicked in specbreadcrumbs-extra-btns-removePhil Hughes2017-09-071-1/+3
| * | fixed new milstone button not being visiblePhil Hughes2017-09-061-3/+1