summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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-1/+13
| | | | | | | | | | | 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-9/+50
|\ | | | | | | | | | | | | Client Implementation: RefService::RefExists Closes gitaly#452 See merge request !13528
| * Client Implementation: RefService::RefExistsgitaly_ref_existsAndrew Newdigate2017-08-182-9/+50
| |
* | Merge branch '36041-notification-title' into 'master'Douwe Maan2017-08-181-12/+22
|\ \ | |/ |/| | | | | | | | | 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-171-12/+22
| |
* | Merge branch 'gitaly-apply-gitattributes' into 'master'Sean McGivern2017-08-182-26/+47
|\ \ | | | | | | | | | | | | | | | | | | Gitaly apply gitattributes Closes gitaly#464 See merge request !13517
| * | Incorporate RepositoryService.ApplyGitattributes Gitaly RPCgitaly-apply-gitattributesAlejandro Rodríguez2017-08-172-26/+47
| | |
* | | Total Pages should be at least onetc-git-tower-pagination-linksToon Claes2017-08-171-6/+11
| | | | | | | | | | | | And the link to the last page cannot be `page=0`.
* | | don't add next page link if current page is out of rangeJordan Patterson2017-08-171-1/+1
|/ /
* | Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-172-2/+37
|\ \ | | | | | | | | | | | | Backports EE mirror stuck handling feature… See merge request !13627
| * | Backports EE mirror stuck handling feature ↵ee-2628-backport-to-ceTiago Botelho2017-08-172-2/+37
| | | | | | | | | | | | (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
* | | Use grpc 1.4.5grpc-1.4.5Jacob Vosmaer2017-08-172-9/+22
| | |
* | | Fix project import to group when there are project milestonesFelipe Artur2017-08-171-4/+17
| | |
* | | Merge branch 'zj-upgrade-grape' into 'master'Douwe Maan2017-08-175-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade grape to 1.0 Closes #36588 See merge request !13609
| * | | Upgrade grape to 1.0Zeger-Jan van de Weg2017-08-165-10/+10
| | | | | | | | | | | | | | | | | | | | Main feature was the deprication of the Hashie stuff, so the access by calling keys as method is gone now.
* | | | Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-163-25/+36
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Only create commit GPG signature when necessary See merge request !13561
| * | | Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-163-25/+36
| |/ /
* | | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-1626-36/+39
|\ \ \ | | | | | | | | | | | | | | | | 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-1426-36/+39
| | | | | | | | | | | | | | | | | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* | | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-1613-19/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
| * | | | Fix two additional violations caused by previous changesrs-trailingwhitespace-copRobert Speicher2017-08-151-1/+0
| | | | |
| * | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-1513-19/+19
| | |_|/ | |/| |
* | | | Merge branch '34643-fix-project-path-slugify' into 'master'Rémy Coutable2017-08-161-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI_PROJECT_PATH_SLUG slugify Closes #34643 See merge request !13350
| * | | | Fix CI_PROJECT_PATH_SLUG slugifyvanadium232017-08-151-0/+13
| | | | |
* | | | | Merge branch 'rs-redis-config-paths' into 'master'Douwe Maan2017-08-164-16/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-154-16/+12
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-162-3/+31
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Speed up project creation by inlining repository creation Closes #34533 See merge request !13529
| * | | | Speed up project creation by inlining repository creationNick Thomas2017-08-152-3/+31
| | |_|/ | |/| |
* | | | Merge branch 'issue_31790' into 'master'Douwe Maan2017-08-151-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API responses when dealing with txt files Closes #31790 See merge request !13474
| * | | | Fix API responses when dealing with txt filesissue_31790Felipe Artur2017-08-151-0/+3
| | | | |
* | | | | 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-152-3/+10
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 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-151-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Handle missing .gitmodules when getting submodule urls See merge request !13509
| * | | | Handle missing .gitmodules when getting submodule urlsmalformed-submoduleJacob Vosmaer2017-08-141-0/+2
| |/ / /
* | | | Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-152-0/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Cache the number of forks of a project See merge request !13535
| * | | Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-142-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The number of forks of a project doesn't change very frequently and running a COUNT(*) every time this information is requested can be quite expensive. We also end up running such a COUNT(*) query at least twice on the homepage of a project. By caching this data and refreshing it when necessary we can reduce project homepage loading times by around 60 milliseconds (based on the timings of https://gitlab.com/gitlab-org/gitlab-ce).
* | | | Merge branch 'gitaly-test-bundle-path' into 'master'Rémy Coutable2017-08-141-2/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Use existing BUNDLE_PATH for gitaly in local tests See merge request !13493
| * | | Use existing BUNDLE_PATH for gitaly in local testsgitaly-test-bundle-pathJacob Vosmaer2017-08-111-2/+6
| | | |
* | | | Merge branch 'gitaly-404-commit-list-files' into 'master'Douwe Maan2017-08-142-22/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102-22/+48
| | | | |
* | | | | Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-141-11/+29
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix: Thread safe GPGME tmp directory Closes #35986 See merge request !13481
| * | | | reset original directory in ensureAlexis Reigel2017-08-141-8/+4
| | | | |
| * | | | use mutex for keychain interactionAlexis Reigel2017-08-141-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+9
| | | | |
* | | | | Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-141-0/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to disable project export on instance See merge request !13211
View Lorry Controller Status