summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '36939-fix-find-blobs-by-path' into 'master'Sean McGivern2017-08-251-11/+32
|\
| * Fix searching for files by pathNick Thomas2017-08-251-11/+32
* | Merge branch 'git-operation-user' into 'master'Sean McGivern2017-08-244-9/+70
|\ \ | |/ |/|
| * Rubocop whitespaceJacob Vosmaer2017-08-232-9/+8
| * Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-232-2/+39
| * Make gl_repository a G::G::Repository attributeJacob Vosmaer2017-08-232-7/+11
| * Decouple GitOperationService from UserJacob Vosmaer2017-08-231-0/+21
* | Merge branch 'fix-old-mr-diffs' into 'master'Douwe Maan2017-08-241-1/+10
|\ \
| * | Show un-highlighted diffs when blobs are the sameSean McGivern2017-08-241-1/+8
| * | Always return a simple diff viewerSean McGivern2017-08-221-0/+2
* | | Delegate Repository::branch_exists? and ref_exists? to Gitlab::GitAndrew Newdigate2017-08-242-1/+24
* | | Merge branch 'sh-fix-branch-count' into 'master'Douwe Maan2017-08-241-1/+1
|\ \ \
| * | | Fix inconsistent number of branches when remote branches are presentsh-fix-branch-countStan Hu2017-08-231-1/+1
* | | | Merge branch 'dm-ldap-adapter-attributes' into 'master'Robert Speicher2017-08-232-5/+10
|\ \ \ \
| * | | | Support simple string LDAP attribute specifications, and search for name rath...dm-ldap-adapter-attributesDouwe Maan2017-08-232-5/+10
* | | | | Merge branch 'fix/gitlay-raw-blame-request-encoding' into 'master'Robert Speicher2017-08-231-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Properly encode Gitaly RawBlame request paramsfix/gitlay-raw-blame-request-encodingAhmad Sherif2017-08-231-2/+2
* | | | | Merge branch 'bvl-improve-bare-project-import' into 'master'Sean McGivern2017-08-231-0/+96
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Migrate creation of nested groups into a serviceBob Van Landuyt2017-08-231-33/+2
| * | | | Improve bare repository importBob Van Landuyt2017-08-231-0/+127
| | |_|/ | |/| |
* | | | Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-232-1/+17
|\ \ \ \
| * | | | Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-222-1/+17
* | | | | Fix a potential timeout in `Gitlab::Logger.read_latest`Robert Speicher2017-08-221-6/+2
| |/ / / |/| | |
* | | | Merge branch 'fix/sm/34762-bad-validation-message' into 'master'Kamil Trzciński2017-08-221-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Enfouce namespace for Kubernetes to lowercaseShinya Maeda2017-08-221-1/+2
| | |/ | |/|
* | | Merge branch 'fix/import-fork-mr' into 'master'Sean McGivern2017-08-222-1/+3
|\ \ \
| * | | Fix fork MRs importing issueJames Lopez2017-08-212-1/+3
* | | | 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