summaryrefslogtreecommitdiff
path: root/spec/features/projects
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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
| |
* | 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
| |/
* | Replace the 'project/archived.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-171-0/+43
|/
* 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
* | Merge branch ↵Grzegorz Bizon2017-09-131-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master' Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790
| * | Fixed Tests + Reverted Try out from before36907-new-issue-from-failed-build-no-longer-links-to-failed-buildTim Zallmann2017-09-121-2/+2
| | |
| * | Implemented the new Description ContentTim Zallmann2017-09-121-1/+1
| | |
| * | Changed Var nameTim Zallmann2017-09-121-2/+2
| | |
| * | Adapting Test for JobsTim Zallmann2017-09-121-2/+2
| | |
* | | Merge branch 'replace_project_issues_award_emoji.feature' into 'master'Rémy Coutable2017-09-121-0/+104
|\ \ \ | | | | | | | | | | | | | | | | 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 Klachkov2017-09-121-0/+104
| |/ / | | | | | | | | | analog
* | | Replace the 'project/builds/summary.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-122-0/+69
|/ /
* | Use WikiPages::CreateService in ↵Rémy Coutable2017-09-121-12/+2
| | | | | | | | | | | | spec/features/projects/wiki/user_updates_wiki_page_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'replace_project_merge_requests_revert.feature' into 'master'Rémy Coutable2017-09-121-0/+59
|\ \ | | | | | | | | | | | | 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 Klachkov2017-09-121-0/+59
| | | | | | | | | | | | rspec analog
* | | Merge branch 'replace_milestone.feature' into 'master'Rémy Coutable2017-09-121-0/+40
|\ \ \ | |/ / |/| | | | | | | | 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 analogVitaliy @blackst0ne Klachkov2017-09-121-0/+40
| | |
* | | Merge branch 'replace_project_merge_requests_accept.feature' into 'master'Rémy Coutable2017-09-111-0/+65
|\ \ \ | | | | | | | | | | | | | | | | 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 ↵blackst0ne2017-09-111-0/+65
| |/ / | | | | | | | | | rspec analog
* | | Merge branch 'replace_spinach_wiki.feature' into 'master'Rémy Coutable2017-09-115-174/+408
|\ \ \ | | | | | | | | | | | | | | | | Replace 'project/wiki.feature' spinach test with an rspec analog See merge request !13856
| * | | Replace 'project/wiki.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-115-174/+408
| |/ /
* | | Merge branch 'replace_group_links.feature' into 'master'Rémy Coutable2017-09-111-0/+41
|\ \ \ | | | | | | | | | | | | | | | | 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 analogVitaliy @blackst0ne Klachkov2017-09-101-0/+41
| |/ /
* | | Replace the project/team_management.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-101-0/+68
|/ /
* | Merge branch ↵Rémy Coutable2017-09-081-0/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree' into 'master' Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree Closes #37569 See merge request !14119
| * | Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_treeRémy Coutable2017-09-071-0/+20
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-071-94/+112
| |/ |/| | | | | | | Do not use `location.pathname` when accessing environments folders See merge request !2147
* | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'Douwe Maan2017-09-073-84/+198
|\ \ | | | | | | | | | | | | | | | | | | Improve "Share with group lock" feature for subgroups Closes #30550 See merge request !13944
| * | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroupsMichael Kozono2017-09-061-9/+9
| | |
| * | Specify nested_groups specsMichael Kozono2017-09-061-1/+1
| | |
| * | Add post-nested group Share lock integration testsMichael Kozono2017-09-061-34/+86
| | |
| * | Add pre-nested group share lock testsMichael Kozono2017-09-061-40/+102
| | |
| * | Refactor and rename specsMichael Kozono2017-09-062-12/+12
| | |
* | | Resolve "Make project and features visibility settings less confusing"Mike Greiling2017-09-074-41/+58
| | |
* | | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-071-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Implement the implied CI/CD config for AutoDevOps Closes #34777 See merge request !13923
| * \ \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-071-0/+0
| |\ \ \ | | | |/ | | |/| | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-071-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2017-09-061-2/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-062-17/+37
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-045-145/+12
| |\ \ \ \ \
| * | | | | | Fix testsZeger-Jan van de Weg2017-09-041-0/+10
| | | | | | |
* | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-071-4/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558