summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Incorporate RepositoryService.ApplyGitattributes Gitaly RPCgitaly-apply-gitattributesAlejandro Rodríguez2017-08-172-26/+47
* Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-171-2/+7
|\
| * Backports EE mirror stuck handling feature (https://gitlab.com/gitlab-org/git...ee-2628-backport-to-ceTiago Botelho2017-08-171-2/+7
* | 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 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-163-25/+36
|\ \
| * | 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-1612-16/+18
|\ \
| * | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-1412-16/+18
* | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-167-12/+11
|\ \ \
| * | | 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-157-12/+12
* | | | Merge branch '34643-fix-project-path-slugify' into 'master'Rémy Coutable2017-08-161-0/+13
|\ \ \ \
| * | | | 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 pathsrs-redis-config-pathsRobert Speicher2017-08-154-16/+12
| | |/ / | |/| |
* | | | Merge branch '34533-speed-up-project-creation' into 'master'Douwe Maan2017-08-162-3/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Speed up project creation by inlining repository creationNick Thomas2017-08-152-3/+31
| | |/ | |/|
* | | Merge branch 'workhorse-deprecate-gitaly-address' into 'master'Douwe Maan2017-08-151-1/+0
|\ \ \
| * | | 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
| |/ / |/| |
* | | Merge branch 'malformed-submodule' into 'master'Douwe Maan2017-08-151-0/+2
|\ \ \ | |_|/ |/| |
| * | Handle missing .gitmodules when getting submodule urlsmalformed-submoduleJacob Vosmaer2017-08-141-0/+2
| |/
* | Merge branch 'gitaly-404-commit-list-files' into 'master'Douwe Maan2017-08-142-22/+48
|\ \
| * | 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
|\ \ \
| * | | reset original directory in ensureAlexis Reigel2017-08-141-8/+4
| * | | use mutex for keychain interactionAlexis Reigel2017-08-141-8/+26
| * | | 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
|\ \ \ \
| * | | | Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-111-0/+79
| | |_|/ | |/| |
* | | | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-112-7/+16
|\ \ \ \
| * | | | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-112-7/+16
| | |_|/ | |/| |
* | | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-113-0/+6
| |/ / |/| |
* | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-113-8/+198
|\ \ \
| * | | Use a specialized class for querying eventsYorick Peterse2017-08-101-0/+4
| * | | Migrate events into a new formatYorick Peterse2017-08-102-8/+194
| | |/ | |/|
* | | Fix merge request diff deserialisation when too_large was absentSean McGivern2017-08-111-0/+2
* | | Merge branch 'gitlab-git-expose-raw-log' into 'master'Sean McGivern2017-08-111-16/+17
|\ \ \
| * | | Expose the raw_log methodgitlab-git-expose-raw-logJacob Vosmaer2017-08-091-16/+17
| | |/ | |/|
* | | Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10James Edwards-Jones2017-08-101-0/+8
* | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-101-1/+5
| |/ |/|
* | Rename RPC 'Exists' to 'RepositoryExists'Jacob Vosmaer2017-08-091-1/+1
* | Fix ee_compat_check when EE branch uses a prefixRémy Coutable2017-08-091-2/+3
* | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-091-1/+1
|/
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-085-8/+8
* Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-0811-89/+108
|\
| * Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-074-22/+55
| * Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-073-28/+39
| * Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-078-45/+20