summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-update-rubocop-gitlab-security' into 'master'Douwe Maan2017-08-291-1/+1
|\
| * Update rubocop-gitlab-security to 0.1.0rs-update-rubocop-gitlab-securityRobert Speicher2017-08-281-1/+1
* | Fix events error importing GitLab projectsJames Lopez2017-08-281-0/+4
|/
* Merge branch 'sh-simplify-system-hook-testing' into 'master'Douwe Maan2017-08-282-0/+54
|\
| * Simplify system hook testing and guarantee test will firesh-simplify-system-hook-testingStan Hu2017-08-272-0/+54
* | Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into backstage/gb/ren...backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-261-11/+3
|\ \ | |/
| * Merge branch '31409-fix-group-and-project-search-for-anonymous-users' into 'm...Kamil Trzciński2017-08-251-11/+3
| |\
| | * Refactor complicated API group finding rules into GroupsFinderNick Thomas2017-08-241-10/+2
| | * Allow v4 API GET requests for groups to be unauthenticatedNick Thomas2017-08-231-4/+4
* | | Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'Kamil Trzciński2017-08-2519-120/+273
|\ \ \ | |/ /
| * | 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-234-81/+100
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix error when importing a GitHub-wiki repositorybvl-improve-bare-project-importBob Van Landuyt2017-08-231-1/+1
| | * | | | Migrate creation of nested groups into a serviceBob Van Landuyt2017-08-232-50/+3
| | * | | | Improve bare repository importBob Van Landuyt2017-08-232-63/+129
| | | |_|/ | | |/| |
| * | | | 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
* | | | | Fix invalid default argument in migration helpersGrzegorz Bizon2017-08-231-1/+1
* | | | | Merge branch 'master' into backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-2214-564/+149
|\ \ \ \ \ | |/ / / /
| * | | | 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
| * | | | | Refactor project and storage typesGabriel Mazetto2017-08-221-1/+1
| * | | | | Prevent using gitlab import task when hashed storage is enabledGabriel Mazetto2017-08-221-0/+6
| * | | | | 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
| |\ \ \