| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Actually clean gitlab-test path when TestEnv.set_repo_refs fails | Rémy Coutable | 2017-06-06 | 1 | -4/+12 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | added testsnotebook-katex-fixes | Phil Hughes | 2017-05-30 | 1 | -1/+1 |
| | | |||||
| * | Re-download and recompile Gitaly in tests if the version changed32762-gitaly-should-be-recompiled-when-gitaly_server_version-changes | Alejandro Rodríguez | 2017-05-24 | 1 | -1/+12 |
| | | |||||
| * | Shorten the last two commit SHA, because CONSISTENCY31562-fix-test_env-set_repo_refs-rspec-profile | Rémy Coutable | 2017-05-18 | 1 | -2/+2 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | If TestEnv#set_repo_refs fails, clean test repos and retry | Rémy Coutable | 2017-05-18 | 1 | -23/+25 |
| | | | | | | | | | | Sometimes, new references are not retrieved when a `git fetch` is called in a bare repos. The easiest solution is to cleanup the test repos and retry in this case. This only happens when a new ref is added to TestEnv::BRANCH_SHA or TestEnv::FORKED_BRANCH_SHA. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Factorize TestEvent#copy_repo | Rémy Coutable | 2017-05-18 | 1 | -12/+3 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Log gitaly output during testing | Jacob Vosmaer | 2017-05-15 | 1 | -1/+2 |
| | | |||||
| * | Don't reuse gRPC channels | Jacob Vosmaer | 2017-05-15 | 1 | -1/+1 |
| | | | | | | | It seems that bad things happen when two gRPC stubs share one gRPC channel so let's stop doing that. The downside of this is that we create more gRPC connections; one per stub. | ||||
| * | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-05-02 | 1 | -1/+2 |
| |\ | | | | | | | | | # Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb | ||||
| | * | Move PDFLab into GitLabpdflab-in-repo | Sam Rose | 2017-04-28 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-04-26 | 1 | -2/+32 |
| |\ \ | |/ | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * | Merge branch 'gitaly-testing-toml' into 'master' | Rémy Coutable | 2017-04-25 | 1 | -3/+4 |
| | |\ | | | | | | | | | | | | | | | | | | | Gitaly testing toml Closes gitaly#182 See merge request !10605 | ||||
| | | * | Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml | Alejandro Rodríguez | 2017-04-18 | 1 | -3/+4 |
| | | | | |||||
| | * | | Merge branch 'master' into notebooklab-in-repo | Phil Hughes | 2017-04-13 | 1 | -1/+29 |
| | |\ \ | | |/ | |||||
| | | * | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testing | Alejandro Rodríguez | 2017-04-11 | 1 | -1/+29 |
| | | | | |||||
| | * | | Pull in fixture files from the repo | Phil Hughes | 2017-04-11 | 1 | -1/+2 |
| | |/ | |||||
| * | | Finished feature specs | Luke "Jared" Bennett | 2017-04-11 | 1 | -0/+1 |
| |/ | |||||
| * | Fix warning when cloning repo that already existsbvl-cleanup-repos | Bob Van Landuyt | 2017-04-02 | 1 | -2/+4 |
| | | | | | | | fixes the warning: fatal: destination path '~/gitlab-ce/gitlab/tmp/tests/gitlab-test-fork_bare' already exists and is not an empty directory. | ||||
| * | Fix Spinach and Capybara dependencies | Stan Hu | 2017-04-01 | 1 | -1/+1 |
| | | | | | Closes #30347 | ||||
| * | Properly eagerly-load the Capybara server for JS feature specs only | Rémy Coutable | 2017-03-31 | 1 | -1/+2 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Eager-load the Capybara server to prevent timeouts | Rémy Coutable | 2017-03-31 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Increase Capybara's timeout | Rémy Coutable | 2017-03-31 | 1 | -6/+0 |
| | | | | | | | | | Also disabled assets warming for Capybara/RSpec and remove a check to skip assets warming when ./tmp/cache/assets/test exists because assets are now served by webpack-dev-server. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Don't clean up the gitlab-test-fork_bare repo | Nick Thomas | 2017-03-30 | 1 | -2/+2 |
| | | |||||
| * | Merge branch '29843-project-subgroup-transfer' into 'security' | Rémy Coutable | 2017-03-29 | 1 | -4/+9 |
| | | | | | | | Use full path for moving directories when changing namespace path See merge request !2078 | ||||
| * | fix new MR form erroneously selects tag as source when branch of same name ↵ | Sanster | 2017-03-24 | 1 | -2/+3 |
| | | | | | exists #23237 | ||||
| * | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 1 | -1/+1 |
| | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility | ||||
| * | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-path | Douwe Maan | 2017-02-23 | 1 | -2/+2 |
| | | |||||
| * | Revert "Prefer leading style for Style/DotPosition" | Douwe Maan | 2017-02-23 | 1 | -4/+4 |
| | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b. | ||||
| * | Prefer leading style for Style/DotPosition | Douwe Maan | 2017-02-23 | 1 | -4/+4 |
| | | |||||
| * | Enable Style/MutableConstant | Douwe Maan | 2017-02-23 | 1 | -2/+2 |
| | | |||||
| * | Backport changes from EE squash | Sean McGivern | 2017-02-03 | 1 | -1/+2 |
| | | | | | | | | Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024> | ||||
| * | Mark MR as WIP when pushing WIP commits | jurre | 2017-01-19 | 1 | -1/+2 |
| | | |||||
| * | Fix Error 500 when creating a merge request that contains an image that was ↵stanhu/gitlab-ce-fix-error-500-with-mr-images | Stan Hu | 2016-11-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | deleted and added Steps to reproduce: 1. Start with a repo with an image 2. Add a commit to delete the image 3. Add another commit to replace the image with another image In a diff comparison, we really just compare about what the image was before the diff, not the direct parent of the last commit. This MR fixes that. Closes #3893, gitlab-org/gitlab-ee#678 Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversion | Adam Niedzielski | 2016-11-10 | 1 | -0/+1 |
| | | | | | | In this case comparing old_path and new_path is not enough because there are two entires that match. | ||||
| * | Use `git update-ref --stdin -z` to speed up TestEnv.set_repo_refs | Nick Thomas | 2016-11-07 | 1 | -13/+11 |
| | | | | | | Previously, we were calling `git update-ref <ref> <sha>` about 30 times per test using `create(:project)` or similar. | ||||
| * | Merge branch 'master' into merge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 1 | -1/+3 |
| |\ | |||||
| | * | Fix Test Env (proper error handling when gitlab-shell is not clonned) | Valery Sizov | 2016-10-17 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Fix Spinach merge request diff failures | Stan Hu | 2016-10-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests. Partial fix to #23378 | ||||
| * | | Fix specs | Sean McGivern | 2016-10-13 | 1 | -2/+2 |
| |/ | |||||
| * | writes tests to verify the issue is solved and fixes breaking issues. | tiagonbotelho | 2016-10-09 | 1 | -1/+3 |
| | | |||||
| * | Fix resolving conflicts on forks21459-resolving-merge-conflicts-from-a-forked-repo-through-ui | Sean McGivern | 2016-08-30 | 1 | -20/+27 |
| | | | | | | | Forks may not be up-to-date with the target project, and so might not contain one of the parent refs in their repo. Fetch this if it isn't present. | ||||
| * | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 1 | -1/+2 |
| | | | | | | | | These can't be resolved in the UI because if they aren't in a UTF-8 compatible encoding, they can't be rendered as JSON. Even if they could, we would be implicitly changing the file encoding anyway, which seems like a bad idea. | ||||
| * | Add more tests for conflicts | Sean McGivern | 2016-08-12 | 1 | -21/+25 |
| | | |||||
| * | Add backend for merge conflicts reading | Sean McGivern | 2016-08-12 | 1 | -0/+2 |
| | | |||||
| * | Add failing test for #20462 | winniehell | 2016-08-02 | 1 | -0/+1 |
| | | |||||
| * | Trim extra displayed carriage returns in diffs and files with CRLFs | Stan Hu | 2016-08-01 | 1 | -1/+2 |
| | | | | | Closes #20440 | ||||
| * | Ensure relative paths for video are rewritten as we do for images20189-markdown-video-doesn-t-work-when-the-referenced-video-file-is-in-same-repo | Rémy Coutable | 2016-07-26 | 1 | -1/+2 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffs | Paco Guzman | 2016-07-18 | 1 | -1/+3 |
| | | |||||
| * | Fix feature specs on CIsingle-file-diffs | Sean McGivern | 2016-07-11 | 1 | -15/+14 |
| | | | | | | MySQL's text column isn't big enough for the diffs in the expand-collapse-diffs branch. | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |