summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-221-0/+25
|
* Fix MR diffs background migration when file modes are missing36630-activerecord-statementinvalid-pg-notnullviolation-error-null-value-in-column-a_mode-violates-not-null-constraintSean McGivern2017-08-181-0/+11
| | | | | | | | | | | Guess the modes based on the following: 1. If the file didn't exist, it's zero. 2. If the diff contains 'Subproject commit', it might be a submodule, so 0600. 3. Otherwise, it's 0644. This isn't perfect, but it doesn't have to be - it won't change file modes in the repository.
* Merge branch 'gitaly_ref_exists' into 'master'Sean McGivern2017-08-182-15/+48
|\ | | | | | | | | | | | | Client Implementation: RefService::RefExists Closes gitaly#452 See merge request !13528
| * Client Implementation: RefService::RefExistsgitaly_ref_existsAndrew Newdigate2017-08-182-15/+48
| |
* | Merge branch '36041-notification-title' into 'master'Douwe Maan2017-08-183-27/+32
|\ \ | |/ |/| | | | | | | | | Don't escape html entities in InlineDiffMarkdownMarker Closes #36041 See merge request !13553
| * Don't escape html entities when rich == raw line36041-notification-titleJarka Kadlecova2017-08-173-27/+32
| |
* | Merge branch 'gitaly-apply-gitattributes' into 'master'Sean McGivern2017-08-181-0/+76
|\ \ | | | | | | | | | | | | | | | | | | Gitaly apply gitattributes Closes gitaly#464 See merge request !13517
| * | Incorporate RepositoryService.ApplyGitattributes Gitaly RPCgitaly-apply-gitattributesAlejandro Rodríguez2017-08-171-0/+13
| | |
| * | Add GitalyClient::RepositoryService specsAlejandro Rodríguez2017-08-171-0/+63
| | |
* | | Total Pages should be at least onetc-git-tower-pagination-linksToon Claes2017-08-171-1/+2
| | | | | | | | | | | | And the link to the last page cannot be `page=0`.
* | | Add specs for pagination Link headerToon Claes2017-08-171-4/+47
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Add specs that check the 'Link' header for the inclusion of: - rel="first" - rel="last" - rel="prev" - rel="next" Fixes gitlab-org/gitlab-ce#36618 Related to gitlab-com/infrastructure#2532
* | Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-171-0/+15
|\ \ | | | | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627
| * | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ceTiago Botelho2017-08-171-0/+15
| | | | | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
* | | Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master'Sean McGivern2017-08-171-16/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve migrations / background migrations testing strategy Closes #36303 See merge request !13589
| * | | Make it possible to provide schema version in testsGrzegorz Bizon2017-08-161-16/+5
| | |/ | |/|
* | | Fix project import to group when there are project milestonesFelipe Artur2017-08-172-20/+118
| | |
* | | Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-162-50/+44
|\ \ \ | | | | | | | | | | | | | | | | Only create commit GPG signature when necessary See merge request !13561
| * | | Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-162-50/+44
| | |/ | |/|
* | | Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable2017-08-161-10/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Circuitbreaker settings to avoid spec-failures Closes #36324 See merge request !13519
| * | | Allow a `failure_wait_time` of 0 for storage accessBob Van Landuyt2017-08-161-10/+49
| | | | | | | | | | | | | | | | | | | | This allows testing every storage attempt after a failure. Which could be useful for tests
* | | | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-161-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
| * | | | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* | | | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-166-14/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
| * | | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-156-14/+14
| | |_|_|/ | |/| | |
* | | | | Merge branch '34643-fix-project-path-slugify' into 'master'Rémy Coutable2017-08-161-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI_PROJECT_PATH_SLUG slugify Closes #34643 See merge request !13350
| * | | | | Fix CI_PROJECT_PATH_SLUG slugifyvanadium232017-08-151-1/+15
| | |/ / / | |/| | |
* | | | | Merge branch 'rs-redis-config-paths' into 'master'Douwe Maan2017-08-161-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't depend on `Rails` for Redis configuration file paths Closes #36514 See merge request !13575
| * | | | | Don't depend on `Rails` for Redis configuration file pathsrs-redis-config-pathsRobert Speicher2017-08-151-0/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Rails` object was not always available in all tasks that require Redis access, such as `mail_room`, so the constant pointing to the configuration path was never defined, but we still attempted to access it in `config_file_name`, resulting in a `NameError` exception. Further, there was no benefit to defining these paths in a constant to begin with -- they're only accessed in one place, and it was within the class where they were being defined. We can just provide them at run-time instead. Further _still_, we were calling `File.expand_path` on the absolute path returned by `Rails.root.join`, which was rather pointless.
* | | | | Merge branch '34533-speed-up-project-creation' into 'master'Douwe Maan2017-08-161-11/+24
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Speed up project creation by inlining repository creation Closes #34533 See merge request !13529
| * | | | Speed up project creation by inlining repository creationNick Thomas2017-08-151-11/+24
| | |_|/ | |/| |
* | | | Merge branch 'workhorse-deprecate-gitaly-address' into 'master'Douwe Maan2017-08-151-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove deprecated field from workhorse API responses See merge request !13567
| * | | | Remove deprecated field from workhorse API responsesworkhorse-deprecate-gitaly-addressJacob Vosmaer2017-08-151-1/+0
| | | | |
* | | | | Add two more project templateszj-add-two-more-project-templatesZ.J. van de Weg2017-08-151-1/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Related to !13108. Mostly this is just running the rake task and changing the task a bit to catch cases like the project already existing or so. The rake task moves archives to the vendor/project_template directory, which are checked in too.
* | | | Merge branch 'malformed-submodule' into 'master'Douwe Maan2017-08-152-4/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Handle missing .gitmodules when getting submodule urls See merge request !13509
| * | | Handle missing .gitmodules when getting submodule urlsmalformed-submoduleJacob Vosmaer2017-08-142-4/+10
| |/ /
* | | Merge branch 'gitaly-404-commit-list-files' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate `Git::Repository.ls_files` to Gitaly Closes gitaly#404 See merge request !13302
| * | | Migrate Git::Repository.ls_files to Gitalygitaly-404-commit-list-filesKim "BKC" Carlbäcker2017-08-101-1/+1
| | | |
* | | | Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-141-0/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Thread safe GPGME tmp directory Closes #35986 See merge request !13481
| * | | | use mutex for keychain interactionAlexis Reigel2017-08-141-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting of the gpg home directory is not thread safe, as the directoy gets stored on the class. if multiple threads change the directory at the same time, one of the threads will be working in the wrong directory.
| * | | | store gpg return directory locallyAlexis Reigel2017-08-111-0/+22
| | | | |
* | | | | Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-141-0/+72
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Don't rename system when migrating from 9.x -> 9.4 Closes #35525 and #36148 See merge request !13228
| * | | | Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-111-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | Update the markdown unconditionally since the move might have been done before, but the markdown not updated.
* | | | | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-112-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate force push check to Gitaly See merge request !13406
| * | | | | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-112-2/+4
| | |_|/ / | |/| | |
* | | | | Merge branch '32004-use-timecop-safe-mode' into 'master'Robert Speicher2017-08-112-17/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Enable Timecop safe mode Closes #32004 See merge request !13498
| * | | | Enable Timecop safe mode32004-use-timecop-safe-modeRémy Coutable2017-08-112-17/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-114-6/+371
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Detect and keep track of flaky specs See merge request !13021
| * | | | Use a new RspecFlakyListener to detect flaky specsRémy Coutable2017-08-114-6/+371
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-115-1/+457
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Use a separate table for storing push events See merge request !12463
| * | | Use a specialized class for querying eventsYorick Peterse2017-08-101-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes various controllers to use the new EventCollection class for retrieving events. This class uses a JOIN LATERAL query on PostgreSQL to retrieve queries in a more efficient way, while falling back to a simpler / less efficient query for MySQL. The EventCollection class also includes a limit on the number of events to display to prevent malicious users from cycling through all events, as doing so could put a lot of pressure on the database. JOIN LATERAL is only supported on PostgreSQL starting with version 9.3.0 and as such this optimisation is only used when using PostgreSQL 9.3 or newer.