summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-211-5/+2
|\ | | | | | | | | Optimize Banzai::Filter::RelativeLinkFilter See merge request !4813
| * Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-211-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | A lot of git operations were being repeated, for example, to build a url you would ask if the path was a Tree, which would call a recursive routine in Gitlab::Git::Tree#where, then ask if the path was a Blob, which would call a recursive routine at Gitlab::Git::Blob#find, making reference to the same git objects several times. Now we call Rugged::Tree#path, which allows us to determine the type of the path in one pass. Some other minor improvement added, like saving commonly used references instead of calculating them each time.
* | Merge branch 'ci-lfs-fetch' into 'master' Rémy Coutable2016-06-211-298/+263
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to fetch LFS from CI ## What does this MR do? This adds support for fetching LFS object from CI jobs (mostly it's made for supporting GitLab CI). ## What is left? - [x] Write tests covering a new authorization mechanism cc @grzesiek @marin See merge request !4465
| * | Add test coverage to LFS fetchingci-lfs-fetchKamil Trzcinski2016-06-211-289/+240
| | |
| * | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-2134-107/+6806
| |\ \ | | |/
| * | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-1021-323/+470
| |\ \
| * | | WIPKamil Trzcinski2016-06-031-11/+25
| | | |
* | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-201-3/+3
| |_|/ |/| |
* | | Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-183-1/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix RangeError exceptions when referring to issues or merge requests outside of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777 See merge request !4777
| * | | Fix RangeError exceptions when referring to issues or merge requests outside ↵Stan Hu2016-06-183-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777
* | | | Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exceptionTimothy Andrew2016-06-181-0/+26
|/ / / | | | | | | | | | | | | | | | | | | 1. An exception would be raised if the filter was called with an invalid URI. Mainly because we weren't catching the `Addressable` exception. 2. This commit fixes it and adds a spec for the filter.
* | | Track method call times/counts as a single metricYorick Peterse2016-06-173-6/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we'd create a separate Metric instance for every method call that would exceed the method call threshold. This is problematic because it doesn't provide us with information to accurately get the _total_ execution time of a particular method. For example, if the method "Foo#bar" was called 4 times with a runtime of ~10 milliseconds we'd end up with 4 different Metric instances. If we were to then get the average/95th percentile/etc of the timings this would be roughly 10 milliseconds. However, the _actual_ total time spent in this method would be around 40 milliseconds. To solve this problem we now create a single Metric instance per method. This Metric instance contains the _total_ real/CPU time and the call count for every instrumented method.
* | | Merge branch 'registry-500-fix' into 'master' Rémy Coutable2016-06-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly support application/json in Container Registry ## What does this MR do? When requesting tags a `application/json` is used by `docker/distribution`. ## Why was this MR needed? Fixes regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18736 See merge request !4742
| * | | Fix regression introduced by ↵registry-500-fixKamil Trzcinski2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 When requesting tags a `application/json` is used.
* | | | Merge branch 'secure-request-uris' into 'master' Yorick Peterse2016-06-171-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Filter out sensitive parameters of metrics data See merge request !4748
| * | | | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-171-0/+16
| | | | |
* | | | | Merge branch 'update-column-in-batches-where' into 'master' Robert Speicher2016-06-171-1/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow customising of queries used for `update_column_in_batches` This MR makes two changes to `add_column_with_default` and `update_column_in_batches`: 1. `add_column_with_default` no longer wraps the entire set of updates in a single transaction, preventing any locks from sticking around for the duration of the entire transaction 2. `update_column_in_batches` now takes a block which can be used to customise the queries. This uses Arel as messing with raw SQL strings is a total pain In !4381 there's a need for updating existing rows/columns in a table in batches using a custom `WHERE` condition. Without the changes in this MR this would not be possible. See merge request !4680
| * | | | Don't update columns in batches in a transactionYorick Peterse2016-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that whatever locks are acquired aren't held onto until the end of the transaction (= after _all_ rows have been updated). Timing wise there's also no difference between using a transaction and not using one.
| * | | | Customizing of update_column_in_batches queriesYorick Peterse2016-06-151-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By passing a block to update_column_in_batches() one can now customize the queries executed. This in turn can be used to only update a specific set of rows instead of simply all the rows in the table.
* | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-177-0/+5705
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114
| * \ \ \ \ fixed merge conflicts on UI branchJames Lopez2016-06-1617-68/+650
| |\ \ \ \ \
| | * \ \ \ \ fixed merge conflictsJames Lopez2016-06-1617-68/+650
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵feature/project-exportJames Lopez2016-06-1617-68/+650
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/project-export # Conflicts: # app/models/ci/pipeline.rb
| | | * | | | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1616-632/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
| | | * | | | | | squashed merge and fixed conflictsJames Lopez2016-06-1616-66/+632
| | | | | | | | |
| | | * | | | | | fix indentsJames Lopez2016-06-141-5/+5
| | | | | | | | |
| * | | | | | | | fix annoying specJames Lopez2016-06-151-1/+1
| | | | | | | | |
| * | | | | | | | fixing specs and some code cleanupJames Lopez2016-06-152-2/+3
| |/ / / / / / /
| * | | | | | | fix mergeJames Lopez2016-06-141-5/+5
| | | | | | | |
| * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-06-142-26/+87
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | * | | | | | better coverage for ReaderJames Lopez2016-06-141-0/+61
| | | | | | | |
| | * | | | | | few changes based on MR feedbackJames Lopez2016-06-131-1/+1
| | | | | | | |
| * | | | | | | few more changes based on feedbackJames Lopez2016-06-131-1/+1
| | | | | | | |
| * | | | | | | fixed specs and refactored a few things due to recent model changes and ↵James Lopez2016-06-131-303/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge conflicts
| * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-06-1376-639/+2656
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import # Conflicts: # app/models/project.rb # db/schema.rb # lib/gitlab/import_export/import_export_reader.rb
| | * | | | | | refactored loads of things due to commits to pipeline changeJames Lopez2016-06-132-12/+19
| | | | | | | |
| | * | | | | | Merge branches 'feature/project-export' and 'master' of ↵James Lopez2016-06-1322-323/+564
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-export
| | * | | | | | | WIP - added missing notes, trying to fix specsJames Lopez2016-06-031-4/+21
| | | | | | | | |
| | * | | | | | | started refactoring a bunch of stuff based on feedbackJames Lopez2016-06-032-4/+4
| | | | | | | | |
| | * | | | | | | merge hellJames Lopez2016-06-0357-393/+2145
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-0357-2145/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2.
| | * | | | | | | Fix merge conflicts - squashed commitJames Lopez2016-06-0357-393/+2145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/project.rb
| * | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-05-181-2/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | * | | | | | | fixed CI commits on exportJames Lopez2016-05-181-2/+7
| | | | | | | | |
| * | | | | | | | fix merge conflictsJames Lopez2016-05-161-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | some changes based on MR feedbackJames Lopez2016-05-161-3/+3
| | | | | | | | |
| * | | | | | | | fix specJames Lopez2016-05-131-2/+6
| | | | | | | | |
| * | | | | | | | fixed leaving comments on notes about missing authorsJames Lopez2016-05-131-1/+1
| | | | | | | | |
| * | | | | | | | update json and fix notes issueJames Lopez2016-05-131-154/+5215
| | | | | | | | |
| * | | | | | | | add message to notes about missing author on importJames Lopez2016-05-132-7/+6
| | | | | | | | |