summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-091-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* 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 RPC Closes gitaly#402 See merge request !13094
| * 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
| | | | | | | | | | | | This helps keep the abstraction layers simpler, and also keep the interface of those methods consistent, in case of implementation changes.
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is recommended that we set this to 50: https://gitlab.com/gitlab-org/gitlab-ce/issues/35098#note_35036746 In this particular issue, the confidence was 42 for Shift JIS, but in fact that's encoded in UTF-8 just with a single bad character. In this case, we shouldn't try to treat it as Shift JIS, but just treat it as UTF-8 and remove invalid bytes. Treating it like Shift JIS would corrupt the whole data. Unfortunately, the diff which would cause this could not be disclosed therefore we can't use it as a test example.
* | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| * | 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 Gitaly Closes gitaly#443 See merge request !13268
| * | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-0/+14
| |/ / | | | | | | | | | Closes gitaly#443
* | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-072-1/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#size to Gitaly Closes gitaly#437 See merge request !13259
| * | | Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-072-1/+21
| |/ / | | | | | | | | | Closes gitaly#437
* | | 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/2551 to CE Closes #21391 See merge request !13275
| * | Backport changes in ↵Nick Thomas2017-08-072-45/+50
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
* | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-60/+76
|\ \ \ | | | | | | | | | | | | | | | | Add Gitlab::Git::Blob.batch method See merge request !13225
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub importer Closes #27429 See merge request !12886
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| * | | | Fixes race condition in project uploadsTiago Botelho2017-08-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally picked as: 3fc0dbcbebcd470fe14f8b5fb7ad55dc3912402e. But given the internals changed, this was changed now. The changelog was removed too.
| * | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0744-389/+885
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| * | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
| * | | | | [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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First iteration, and some stuff is missing. But basically this rake task does a clone of a project we've pointed it to. Than creates a project on the GDK, which should be running in the background. This project is exported, after which we move that archive to the location we need it. We clean up by removing the generated project. The first idea was to export the project on .com too, however than we might run into ImportExport versions mismatch. This could've been circumvented by checkout out an older commit locally. This however is not needed yet, so we opted to not go this route yet, instead we will iterate on what we got.
| * | | | | Allow projects to be started from a templateZ.J. van de Weg2017-07-282-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Started implementation for the first iteration of gitlab-org/gitlab-ce#32420. This will allow users to select a template to start with, instead of an empty repository in the project just created. Internally this is basically a small extension of the ImportExport GitLab projects we already support. We just import a certain import tar archive. This commits includes the first one: Ruby on Rails. In the future more will be added.
* | | | | | Merge branch 'gitlab-git-repository-log-options' into 'master'Sean McGivern2017-08-071-14/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Set default options outside the raw_log method See merge request !13346
| * | | | | Set default options outside the raw_log methodJacob Vosmaer2017-08-071-14/+15
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The raw_log method is meant to become the Gitaly RPC boundary. By setting the defaults before doing the RPC we keep the RPC implementation simpler. We also sidestep the unfortunate subtleties of what happens when options[:limit] is not set, or nil.
* | | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add star for action scope, in order to delete image from registry Closes #26465 See merge request !13248
| * \ \ \ Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-0711-51/+253
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (184 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| * | | | Cleanup tests and add admin_container_image toLin Jen-Shin2017-08-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | full_authentication_abilities. This is fine because we're going to check with can?(..) anyway
* | | | | Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-0710-7/+349
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Circuitbreaker for storage paths Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775 See merge request !11449
| * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
| * | | | | | 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
| | | | | | |
* | | | | | | Add Korean translation to i18nHuang Tao2017-08-071-1/+2
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-072-84/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Gitaly deletions and annotations See merge request !13280
| * | | | | Migration link for Repository#logJacob Vosmaer2017-08-031-0/+1
| | | | | |
| * | | | | Remove unused methodsJacob Vosmaer2017-08-031-77/+0
| | | | | |
| * | | | | Remove unnecessary 'raw' aliasJacob Vosmaer2017-08-031-5/+0
| | | | | |
| * | | | | Rename 'commits_between' to 'rugged_commits_between'Jacob Vosmaer2017-08-032-2/+4
| | | | | |
* | | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-061-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Timezone Inconsistencies in User Contribution Calendar Closes #27616 and #1943 See merge request !13208
View Lorry Controller Status