summaryrefslogtreecommitdiff
path: root/spec/features
Commit message (Collapse)AuthorAgeFilesLines
* Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer2017-10-031-1/+1
|
* Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-032-0/+48
|\ | | | | | | | | Move Fast-Forward Merge to CE See merge request gitlab-org/gitlab-ce!14272
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-025-9/+89
| |\
| * | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-0/+8
| | |
| * | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-282-1/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb db/schema.rb
| * \ \ Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2631-228/+556
| |\ \ \
| * | | | Add test to check for project settings merge strategiesEric Eastwood2017-09-261-0/+18
| | | | |
| * | | | Port fast-forward widget_spec test from EEEric Eastwood2017-09-191-0/+22
| | | | |
* | | | | Create failing test caserobdel122017-09-301-0/+18
| |_|_|/ |/| | |
* | | | Fix fork button being disabled for users who can fork to groupPhil Hughes2017-09-291-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the fork button was disabled for all users if they have exceeded their project limit. This fixes that by changing the check to see if the user can fork to a group instead of their own namespace. This behaviour is already possible by visiting the new fork page directly, so this just fixes the button being disabled. Closes #38462
* | | | Merge branch 'breadcrumb-item-links' into 'master'Tim Zallmann2017-09-293-3/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed breadcrumb title not linking Closes #38059 See merge request gitlab-org/gitlab-ce!14532
| * | | | spec fixesbreadcrumb-item-linksPhil Hughes2017-09-282-3/+3
| | | | |
| * | | | Fixed breadcrumb title not linkingPhil Hughes2017-09-271-0/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the breadcrumb titles not having links. This was a regression in the updated breadcrumbs introduced in 10.0. This introduces the link for all pages rather than selectively doing it. This will cover issues, merge requests, pipelines, jobs etc. Closes #38059
* | | | Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master'Robert Speicher2017-09-281-6/+21
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Migrate Git::Repository#rm_tag to Gitaly Closes gitaly#562 See merge request gitlab-org/gitlab-ce!14388
| * | | Migrate Git::Repository#rm_tag to GitalyAhmad Sherif2017-09-281-6/+21
| |/ / | | | | | | | | | Closes gitaly#562
* | | Merge branch 'jramsay-spelling-occurred' into 'master'Jacob Schatz2017-09-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix spelling of occurred See merge request gitlab-org/gitlab-ce!14488
| * | | Fix spelling of occurredjramsay-spelling-occurredJames Ramsay2017-09-261-1/+1
| |/ /
* | | Fixes commit comments in side-by-side diff viewcommit-side-by-side-commentPhil Hughes2017-09-271-0/+36
|/ / | | | | | | | | | | | | | | | | | | This was caused by the `notes` global class not existing when the `file_comment_button` code is run. The notes class was used to check if the diff is currently in parallel view or not. To get around this I've added a check into the `file_comment_button` JS to check if the view is currently parallel or not. Closes #38117
* | Fix specsAnnabel Dunstone Gray2017-09-253-3/+3
| |
* | Merge branch 'improve_sorting_list' into 'master'Douwe Maan2017-09-257-117/+49
|\ \ | | | | | | | | | | | | | | | | | | Improve list of sorting options Closes #36929 See merge request gitlab-org/gitlab-ce!14320
| * | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-237-117/+49
| | |
* | | Merge branch 'project-page-clearer' into 'master'Filipa Lacerda2017-09-251-0/+19
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add context tabs to dashboard/projects Closes #29045 See merge request gitlab-org/gitlab-ce!14364
| * | Add context tabs to dashboard/projectsPhil Hughes2017-09-221-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to quickly switch between all projects they have access to & there own namespace projects. These tabs also keep the same filtering/search options selected so the user can quickly switch between the two different contexts. Closes #29045
* | | Merge branch 'replace_project_shortcuts.feature' into 'master'Rémy Coutable2017-09-222-21/+108
|\ \ \ | |/ / |/| | | | | | | | 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.featureVitaliy @blackst0ne Klachkov2017-09-222-21/+108
| | |
* | | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-221-5/+35
|\ \ \ | | | | | | | | | | | | | | | | 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-linkClement Ho2017-09-201-5/+35
| | | |
* | | | Replace the 'project/service.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-2216-27/+342
| |/ / |/| |
* | | Removed User Callout for Customer ExperienceTim Zallmann2017-09-201-55/+0
| |/ |/|
* | Merge branch 'acey-flakes' into 'master'Rémy Coutable2017-09-191-10/+6
|\ \ | | | | | | | | | | | | fix transient user_edits_files_spec failures See merge request gitlab-org/gitlab-ce!14324
| * | fix transient user_edits_files_spec failuresacey-flakesSimon Knox2017-09-181-10/+6
| | |
* | | Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-181-0/+18
| |/ |/| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors.
* | Merge branch 'update-user_uses_slash_commands_spec' into 'master'Rémy Coutable2017-09-181-4/+4
|\ \ | | | | | | | | | | | | Minor update to address Sean McGivern's comment. See merge request gitlab-org/gitlab-ce!14311
| * | Minor update to address Sean McGivern's comment.manolis2017-09-151-4/+4
| |/ | | | | | | More details are available here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13436/diffs#note_39115837
* | Merge branch 'replace_project_snippets.feature' into 'master'Rémy Coutable2017-09-184-0/+90
|\ \ | | | | | | | | | | | | 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 analogVitaliy @blackst0ne Klachkov2017-09-184-0/+90
| |/
* | Merge branch 'replace_project_commits_revert.feature' into 'master'Rémy Coutable2017-09-181-0/+56
|\ \ | | | | | | | | | | | | 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 analogVitaliy @blackst0ne Klachkov2017-09-181-0/+56
| |/
* | Merge branch 'replace_project_archived.feature' into 'master'Rémy Coutable2017-09-181-0/+43
|\ \ | | | | | | | | | | | | 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 analogVitaliy @blackst0ne Klachkov2017-09-171-0/+43
| |/
* | Merge branch 'improve_spec_features_profiles_specs' into 'master'Rémy Coutable2017-09-187-38/+33
|\ \ | | | | | | | | | | | | | | | | | | Improve 'spec/features/profiles/*' specs Closes #37855 et #37856 See merge request gitlab-org/gitlab-ce!14317
| * | Improve 'spec/features/profiles/*' specsVitaliy @blackst0ne Klachkov2017-09-167-38/+33
| |/
* | Replace the 'search.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-1611-310/+554
|/
* Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-151-1/+1
|\ | | | | | | | | Remove title attribute from sidebar elements See merge request gitlab-org/gitlab-ce!14140
| * fixed merge request specrevert-sidebar-title-attributePhil Hughes2017-09-131-1/+1
| |
* | Merge branch '20824-scope-users-to-members-in-group-issuable-list' into 'master'Phil Hughes2017-09-151-0/+22
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Scope users by group inside dropdowns if I'm on group page (Issue, MRs)" Closes #20824 See merge request gitlab-org/gitlab-ce!14249
| * | Return only group's members in user dropdowns on issuables list pages20824-scope-users-to-members-in-group-issuable-listRémy Coutable2017-09-141-0/+22
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Use the new query-recorder features as a PoCbvl-extend-query-recorderBob Van Landuyt2017-09-141-2/+2
| |
* | Merge branch ↵Douwe Maan2017-09-141-0/+13
|\ \ | |/ |/| | | | | | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
| * rework the html_safe not to use haml's auto escapingmicael.bergeron2017-09-111-0/+13
| | | | | | | | add feature test for inline diff in file header
View Lorry Controller Status