summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34533-inline-single-authorized-projects' into 'master'Douwe Maan2017-08-221-9/+48
|\
| * Use event-based waiting in Gitlab::JobWaiterNick Thomas2017-08-221-9/+48
* | New storage is now "Hashed" instead of "UUID"Gabriel Mazetto2017-08-221-0/+1
* | Merge branch 'gitaly-tree-entries-encoding' into 'master'36778-url-redirection-from-old-note-attachments-path-to-new-uploads-path-not-working36775-move-helm-chart-data-to-gitlab-ce-repo-instead-of-omnibus-docsRobert Speicher2017-08-211-2/+2
|\ \
| * | Correctly encode string params for Gitaly's TreeEntries RPCgitaly-tree-entries-encodingAlejandro Rodríguez2017-08-211-2/+2
* | | Merge branch 'only-limit-fetch-when-requested' into 'master'Robert Speicher2017-08-211-0/+2
|\ \ \ | |/ / |/| |
| * | Only require sidekiq-limit_fetch when enabled in settingsonly-limit-fetch-when-requestedSean McGivern2017-08-211-0/+2
| |/
* | Merge branch 'backstage/gb/migrate-stages-statuses' into 'master'Kamil Trzciński2017-08-211-0/+77
|\ \
| * \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-08-1671-533/+1636
| |\ \
| * \ \ Merge commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3' into backstage/gb/mig...Grzegorz Bizon2017-07-3115-262/+415
| |\ \ \
| * \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-2610-55/+90
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-2419-99/+278
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-201-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-2074-644/+1076
| |\ \ \ \ \ \ \
| * | | | | | | | Freeze mutable constants in stages migration codeGrzegorz Bizon2017-07-111-1/+1
| * | | | | | | | Schedule stages statuses bg migrations in batchesGrzegorz Bizon2017-07-101-2/+3
| * | | | | | | | Merge branch 'master' into backstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-1049-241/+583
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Move stages status migration to the background workerbackstage/gb/migrate-stages-statusesGrzegorz Bizon2017-07-051-0/+76
| * | | | | | | | | Merge branch 'fix/gb/stage-id-reference-background-migration' into backstage/...Grzegorz Bizon2017-07-051-0/+19
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Sanitize id value passed to async background migrationGrzegorz Bizon2017-06-301-3/+1
| | * | | | | | | | | Improve readability of build stage id migration queryGrzegorz Bizon2017-06-291-6/+7
| | * | | | | | | | | Test if argument passed to a migration is presentGrzegorz Bizon2017-06-291-1/+1
| | * | | | | | | | | Add initial build stage_id ref background migrationGrzegorz Bizon2017-06-281-7/+11
| | * | | | | | | | | Add initial stage_id background migration filesGrzegorz Bizon2017-06-281-0/+16
* | | | | | | | | | | Merge branch 'gitaly-annotations-update' into 'master'Douwe Maan2017-08-211-23/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Simplify return valuesgitaly-annotations-updateJacob Vosmaer2017-08-181-1/+4
| * | | | | | | | | | Simplify method argumentsJacob Vosmaer2017-08-181-2/+2
| * | | | | | | | | | More annotationsJacob Vosmaer2017-08-181-0/+4
| * | | | | | | | | | Delete unused Gitlab::Git methodsJacob Vosmaer2017-08-181-20/+0
| * | | | | | | | | | Add Gitaly annotationJacob Vosmaer2017-08-181-0/+2
* | | | | | | | | | | Merge branch 'rs-git-access-spec-speed' into 'master'Douwe Maan2017-08-211-9/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reduce duplication in GitAccess spec around error messagesrs-git-access-spec-speedRobert Speicher2017-08-181-9/+10
* | | | | | | | | | | | Fix Error 500s when attempting to destroy a protected tagStan Hu2017-08-201-0/+5
|/ / / / / / / / / / /
* | | | | | | | | | | 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
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'gitaly_ref_exists' into 'master'Sean McGivern2017-08-182-9/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 when rich == raw line36041-notification-titleJarka Kadlecova2017-08-171-12/+22
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | 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
| | |_|/ / / / / / / / / | |/| | | | | | | | | |