Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dm-copy-parallel-diff' into 'master' | Phil Hughes | 2017-10-03 | 1 | -1/+1 |
|\ | | | | | | | | | Only copy old/new code when selecting left/right side of parallel diff See merge request gitlab-org/gitlab-ce!14561 | ||||
| * | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diff | Douwe Maan | 2017-10-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-26 | 10 | -444/+24 |
|\ \ | |/ | |||||
| * | Improve list of sorting options | Vitaliy @blackst0ne Klachkov | 2017-09-23 | 5 | -27/+23 |
| | | |||||
| * | Merge branch 'replace_project_shortcuts.feature' into 'master' | Rémy Coutable | 2017-09-22 | 2 | -105/+0 |
| |\ | | | | | | | | | | | | | Replace the 'project/shortcuts.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14431 | ||||
| | * | Replace the 'project/shortcuts.feature' spinach test with an rspec analogreplace_project_shortcuts.feature | Vitaliy @blackst0ne Klachkov | 2017-09-22 | 2 | -105/+0 |
| | | | |||||
| * | | Merge branch 'add-view-replaced-file-link' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Add view replaced file link for image diffs See merge request gitlab-org/gitlab-ce!14394 | ||||
| | * | | Add view replaced file link for image diffsadd-view-replaced-file-link | Clement Ho | 2017-09-20 | 1 | -1/+1 |
| | |/ | |||||
| * | | Replace the 'project/service.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-22 | 2 | -311/+0 |
| |/ | |||||
* | | Port fast-foward spinach specs from EE | Eric Eastwood | 2017-09-19 | 2 | -0/+89 |
|/ | |||||
* | Merge branch 'replace_project_snippets.feature' into 'master' | Rémy Coutable | 2017-09-18 | 2 | -135/+0 |
|\ | | | | | | | | | Replace the 'project/snippets.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14326 | ||||
| * | Replace the 'project/snippets.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-18 | 2 | -135/+0 |
| | | |||||
* | | Merge branch 'replace_project_commits_revert.feature' into 'master' | Rémy Coutable | 2017-09-18 | 2 | -73/+0 |
|\ \ | | | | | | | | | | | | | Replace the 'project/commits/revert.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14325 | ||||
| * | | Replace the 'project/commits/revert.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-18 | 2 | -73/+0 |
| |/ | |||||
* | | Merge branch 'replace_project_archived.feature' into 'master' | Rémy Coutable | 2017-09-18 | 2 | -66/+0 |
|\ \ | | | | | | | | | | | | | Replace the 'project/archived.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14322 | ||||
| * | | Replace the 'project/archived.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-17 | 2 | -66/+0 |
| |/ | |||||
* | | Replace the 'search.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-16 | 2 | -216/+0 |
|/ | |||||
* | Replace the 'profile/active_tab.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-13 | 2 | -54/+0 |
| | |||||
* | Merge branch 'replace_project_issues_award_emoji.feature' into 'master' | Rémy Coutable | 2017-09-12 | 2 | -152/+0 |
|\ | | | | | | | | | Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog See merge request !14202 | ||||
| * | Replace the 'project/issues/award_emoji.feature' spinach test with an rspec ↵ | Vitaliy @blackst0ne Klachkov | 2017-09-12 | 2 | -152/+0 |
| | | | | | | | | analog | ||||
* | | Replace the 'project/builds/summary.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-12 | 2 | -73/+0 |
|/ | |||||
* | Merge branch 'replace_project_merge_requests_revert.feature' into 'master' | Rémy Coutable | 2017-09-12 | 2 | -85/+0 |
|\ | | | | | | | | | Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog See merge request !14201 | ||||
| * | Replace the 'project/merge_requests/revert.feature' spinach test with an ↵ | Vitaliy @blackst0ne Klachkov | 2017-09-12 | 2 | -85/+0 |
| | | | | | | | | rspec analog | ||||
* | | Merge branch 'replace_milestone.feature' into 'master' | Rémy Coutable | 2017-09-12 | 2 | -78/+0 |
|\ \ | |/ |/| | | | | | Replace the 'project/milestone.feature' spinach test with an rspec analog See merge request !14171 | ||||
| * | Replace the project/milestone.feature spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-12 | 2 | -78/+0 |
| | | |||||
* | | Merge branch 'replace_project_merge_requests_accept.feature' into 'master' | Rémy Coutable | 2017-09-11 | 2 | -83/+0 |
|\ \ | | | | | | | | | | | | | Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog See merge request !14176 | ||||
| * | | Replace the 'project/merge_requests/accept.feature' spinach test with an ↵ | blackst0ne | 2017-09-11 | 2 | -83/+0 |
| |/ | | | | | | | rspec analog | ||||
* | | Merge branch 'replace_spinach_wiki.feature' into 'master' | Rémy Coutable | 2017-09-11 | 2 | -296/+0 |
|\ \ | | | | | | | | | | | | | Replace 'project/wiki.feature' spinach test with an rspec analog See merge request !13856 | ||||
| * | | Replace 'project/wiki.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-11 | 2 | -296/+0 |
| |/ | |||||
* | | Merge branch 'replace_group_links.feature' into 'master' | Rémy Coutable | 2017-09-11 | 2 | -67/+0 |
|\ \ | | | | | | | | | | | | | Replace 'project/group_links.feature' spinach test with an rspec analog See merge request !14169 | ||||
| * | | Replace project/group_links.feature spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-10 | 2 | -67/+0 |
| |/ | |||||
* | | Merge branch 'replace_emails.feature' into 'master' | Rémy Coutable | 2017-09-11 | 2 | -74/+0 |
|\ \ | | | | | | | | | | | | | Replace the 'profile/emails.feature' spinach test with an rspec analog See merge request !14172 | ||||
| * | | Replace the profile/emails.feature spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-10 | 2 | -74/+0 |
| |/ | |||||
* | | Replace the project/team_management.feature spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-10 | 2 | -113/+0 |
|/ | |||||
* | Resolve "Make project and features visibility settings less confusing" | Mike Greiling | 2017-09-07 | 2 | -2/+1 |
| | |||||
* | Merge branch '23079-remove-default-scope-in-sortable' into 'master' | Douwe Maan | 2017-09-07 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558 | ||||
| * | Removes default scope from sortable23079-remove-default-scope-in-sortable | Tiago Botelho | 2017-09-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'events-migration-cleanup' into 'master' | Sean McGivern | 2017-09-07 | 1 | -9/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932 | ||||
| * | | Finish migration to the new events setupevents-migration-cleanup | Yorick Peterse | 2017-09-06 | 1 | -9/+4 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241 | ||||
* | | Merge branch 'fly-out-top-level-item' into 'master' | Filipa Lacerda | 2017-09-07 | 3 | -4/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | Add top level items to fly-out navigation Closes #36294 See merge request !13981 | ||||
| * | | fixed spinach specsfly-out-top-level-item | Phil Hughes | 2017-09-06 | 1 | -1/+1 |
| | | | |||||
| * | | spec fixes | Phil Hughes | 2017-09-06 | 1 | -1/+1 |
| | | | |||||
| * | | Add top level items to fly-out navigation | Phil Hughes | 2017-09-06 | 3 | -5/+5 |
| |/ | | | | | | | | | | | This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed. Closes #36294 | ||||
* | | fixed new issue button not being clicked in specbreadcrumbs-extra-btns-remove | Phil Hughes | 2017-09-07 | 1 | -1/+3 |
| | | |||||
* | | fixed new milstone button not being visible | Phil Hughes | 2017-09-06 | 1 | -3/+1 |
| | | |||||
* | | spec fixes | Phil Hughes | 2017-09-06 | 5 | -5/+5 |
| | | |||||
* | | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-06 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Enable all gitaly features in spinach testsgitaly-spinach | Alejandro Rodríguez | 2017-09-05 | 1 | -0/+3 |
| | | |||||
* | | fixed up JS to use a js-* class | Phil Hughes | 2017-09-06 | 2 | -3/+3 |
| | | | | | | | | fixed up Ruby based on review | ||||
* | | test fixes | Phil Hughes | 2017-09-05 | 2 | -3/+3 |
|/ | | | | removed un-used file |