summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Raise encoding confidence threshold to 50Lin Jen-Shin2017-08-081-1/+1
* | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+1
|\ \
| * | Exclude merge_jid on Import/Export attribute configurationOswaldo Ferreira2017-08-071-0/+1
* | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-0/+14
|\ \ \
| * | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-0/+14
| |/ /
* | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-072-1/+21
|\ \ \
| * | | Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-072-1/+21
| |/ /
* | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-072-45/+50
|\ \ \ | |_|/ |/| |
| * | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-072-45/+50
* | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-60/+76
|\ \ \
| * | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-7/+6
| * | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-60/+77
* | | | Merge branch 'github' into 'master'Robert Speicher2017-08-071-1/+1
|\ \ \ \
| * | | | Set the new GitHub import as import sourceDouglas Barbosa Alexandre2017-08-071-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+45
|\ \ \ \
| * | | | Fixes race condition in project uploadsTiago Botelho2017-08-071-3/+1
| * | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0744-389/+885
| |\ \ \ \
| * | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-012-3/+3
| * | | | | [ci skip] Adds svgs and css for all iconsFilipa Lacerda2017-08-011-3/+1
| * | | | | Create rake task to create project templatesZ.J. van de Weg2017-08-011-2/+10
| * | | | | Allow projects to be started from a templateZ.J. van de Weg2017-07-282-1/+42
* | | | | | Merge branch 'gitlab-git-repository-log-options' into 'master'Sean McGivern2017-08-071-14/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Set default options outside the raw_log methodJacob Vosmaer2017-08-071-14/+15
| | |_|/ / | |/| | |
* | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-53/+123
|/ / / /
* | | | Merge branch 'add-star-for-action-scope' into 'master'Rémy Coutable2017-08-071-1/+2
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-0711-51/+253
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Cleanup tests and add admin_container_image toLin Jen-Shin2017-08-021-1/+2
* | | | | Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-0710-7/+349
|\ \ \ \ \
| * | | | | Use correct `Environment`-class within `Gitlab` namespaceBob Van Landuyt2017-08-073-4/+4
| * | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-075-102/+71
| |\ \ \ \ \
| * | | | | | Use ruby's `File.stat` to check storage availabilityBob Van Landuyt2017-08-041-19/+15
| * | | | | | Use a Struct to keep track of failure infoBob Van Landuyt2017-08-041-11/+7
| * | | | | | Only track accessibility onceBob Van Landuyt2017-08-041-8/+14
| * | | | | | Use `keys` instead of `scan_each`Bob Van Landuyt2017-08-042-20/+10
| * | | | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-042-1/+8
| * | | | | | Make sure the check works for paths with spaces.Bob Van Landuyt2017-08-041-1/+1
| * | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-046-3/+350
View Lorry Controller Status