summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-0916-27/+27
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-084-48/+62
|\ | | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
| * Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-072-1/+18
| |
| * Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-073-13/+5
| | | | | | | | | | | | 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-073-34/+39
| |
* | Make sure that we have author and committerLin Jen-Shin2017-08-081-0/+3
| | | | | | | | In case we don't have it setup in ~/.gitconfig
* | Add a test to show that threshold 40 would corrupt35098-raise-encoding-confidence-thresholdLin Jen-Shin2017-08-081-0/+44
| | | | | | | | | | | | | | | | | | | | | | If we set `ENCODING_CONFIDENCE_THRESHOLD` to 40, this test case would not pass. If we raise to 50, this would pass. Note that if in the future rugged didn't return corrupt data, this would be less relevant. But still icu recommend the threshold to be 50, we should just stick with 50.
* | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-082-10/+0
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| * | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-072-10/+0
| | |
* | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-073-16/+160
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 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-073-16/+160
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
* | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-0/+71
|\ \ \ | | | | | | | | | | | | | | | | Add Gitlab::Git::Blob.batch method See merge request !13225
| * | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-5/+5
| | | |
| * | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-0/+71
| | | |
* | | | 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/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| * | | | After merge cleanupZ.J. van de Weg2017-08-071-1/+1
| | | | |
| * | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-07292-1021/+2214
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-011-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
| * | | | | Create rake task to create project templatesZ.J. van de Weg2017-08-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-071-67/+129
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support group milestone references Closes #34778 See merge request !13289
| * | | | | Support references to group milestonesSean McGivern2017-08-071-67/+129
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references.
* | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-1/+205
| |_|/ / |/| | |
* | | | 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-07118-345/+595
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | Use `broken_storage` in the fs_shards_spec.Bob Van Landuyt2017-08-071-1/+1
| | | | |
* | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-075-60/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
| * \ \ \ \ Merge branch 'mattermost_fixes' into 'master'Sean McGivern2017-08-071-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Mattermost integration See merge request !13305
| | * | | | | Fix Mattermost integrationmattermost_fixesValery Sizov2017-08-041-3/+4
| | | | | | |
| * | | | | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-072-7/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Gitaly deletions and annotations See merge request !13280
| | * | | | | Remove unnecessary 'raw' aliasJacob Vosmaer2017-08-032-2/+1
| | | | | | |
| | * | | | | Rename 'commits_between' to 'rugged_commits_between'Jacob Vosmaer2017-08-031-5/+5
| | | | | | |
| * | | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-061-4/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Timezone Inconsistencies in User Contribution Calendar Closes #27616 and #1943 See merge request !13208
| | * | | | | | add tests for proper timezone date grouping within ContributionsCalendarMike Greiling2017-07-311-4/+34
| | | | | | | |
| * | | | | | | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-031-46/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#421
* | | | | | | | Use ruby's `File.stat` to check storage availabilityBob Van Landuyt2017-08-041-3/+12
| | | | | | | |
* | | | | | | | Only track accessibility onceBob Van Landuyt2017-08-041-3/+32
| | | | | | | |
* | | | | | | | Use `keys` instead of `scan_each`Bob Van Landuyt2017-08-041-1/+3
| | | | | | | |
* | | | | | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-041-1/+1
| | | | | | | |
* | | | | | | | Make sure the check works for paths with spaces.Bob Van Landuyt2017-08-041-0/+22
| | | | | | | |
* | | | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-046-2/+418
|/ / / / / / /
* | | | | | | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'Robert Speicher2017-08-031-17/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitaly Closes gitaly#415 See merge request !13121
| * | | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-021-17/+27
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Closes gitaly#415
* | | | | | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-031-0/+188
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request commits background migration See merge request !12685
| * | | | | | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-031-0/+188
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we stored these as serialised fields - `st_{commits,diffs}` - on the `merge_request_diffs` table. These now have their own tables - `merge_request_diff_{commits,diffs}` - with a column for each attribute of the serialised data. Add a background migration to go through the existing MR diffs and migrate them to the new format. Ignore any contents that cannot be displayed. Assuming that we have 5 million rows to migrate, and each batch of 2,500 rows can be completed in 5 minutes, this will take about 7 days to migrate everything.
* | | | | | | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-032-17/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send rejection mails for all auto-generated mails Closes #28472 See merge request !13254
| * | | | | | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mailsLin Jen-Shin2017-08-032-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make it easier to have mailer helper