summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ee-2628-backport-to-ce' into 'master'Douwe Maan2017-08-172-2/+37
|\
| * Backports EE mirror stuck handling feature (https://gitlab.com/gitlab-org/git...ee-2628-backport-to-ceTiago Botelho2017-08-172-2/+37
* | 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.0Zeger-Jan van de Weg2017-08-165-10/+10
* | | 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-1626-36/+39
|\ \
| * | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-1426-36/+39
* | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-1613-19/+18
|\ \ \
| * | | 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 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 'issue_31790' into 'master'Douwe Maan2017-08-151-0/+3
|\ \ \ \
| * | | | 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 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
| |/ / / |/| | |
* | | | 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 'forks-count-cache' into 'master'Douwe Maan2017-08-152-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-142-0/+4
* | | | Merge branch 'gitaly-test-bundle-path' into 'master'Rémy Coutable2017-08-141-2/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 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
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+1
|\ \ \ \ \ \
| * | | | | | Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs-coverage-updates' into 'master'Rémy Coutable2017-08-114-16/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-114-16/+6
| |/ / / /
* | | | | Merge branch '36213-return-is_admin-in-users-api-when-current_user-is-admin' ...Sean McGivern2017-08-111-9/+4
|\ \ \ \ \
| * | | | | Include the `is_admin` field in the `GET /users/:id` API when current user is...Rémy Coutable2017-08-111-9/+4
* | | | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-113-0/+160
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use a new RspecFlakyListener to detect flaky specsRémy Coutable2017-08-113-0/+160
* | | | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-115-10/+220
|\ \ \ \ \ \
| * | | | | | Use a specialized class for querying eventsYorick Peterse2017-08-101-0/+4
View Lorry Controller Status