summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'limit-email-diff-size' into 'master' Robert Speicher2016-06-201-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Limit push email diff size Restrict the size of diffs in push emails to 30 lines / 150 KB (whichever is smaller), following https://gitlab.com/gitlab-org/gitlab_git/merge_requests/85. Emails on push can get very large if they contain a lot of files that sneak under the single-file limit. https://gitlab.com/gitlab-org/gitlab-ee/issues/490 See merge request !4566
| * Limit push email diff sizelimit-email-diff-sizeSean McGivern2016-06-171-1/+1
| | | | | | | | Limit push email diff size to 30 files or 150 KB, whichever comes first.
* | use rails root joinJames Lopez2016-06-201-1/+1
| |
* | fixed a couple of errors spotted in productionJames Lopez2016-06-201-1/+1
| |
* | Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-182-1/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-182-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
|/ / | | | | | | | | | | | | 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.
* | Merge branch 'gh-webhooks' into 'master' Robert Speicher2016-06-171-5/+18
|\ \ | | | | | | | | | | | | | | | | | | Avoid that GitHub import fails when retrieving Webhooks for non GitHub admins Closes #18729 See merge request !4723
| * | Listing GH Webhooks doesn't stop import process for non GH admin usersDouglas Barbosa Alexandre2016-06-171-5/+18
| | |
* | | Add endpoints for award emoji on notesZ.J. van de Weg2016-06-172-69/+83
| | | | | | | | | | | | Docs also added.
* | | Sort API endpoints and implement feedbackZ.J. van de Weg2016-06-174-35/+40
| | |
* | | Add endpoints for Award EmojiZ.J. van de Weg2016-06-174-1/+107
|/ / | | | | | | | | This only supports Issues and MergeRequests right now because of the consistency of the routes those models provide.
* | Merge branch 'track-total-method-call-time' into 'master' Robert Speicher2016-06-173-22/+84
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Track method call times/counts as a single metric This changes method call tracking so only a single metric is emitted regardless of the number of calls. This allows us to more accurately measure the total execution time of a method as well as the number of times a method is called. See 851e3ff7578973c2206628424eac3b951a3c656d for more details. Method call tracking tracked calls individually meaning the end statistics may not always be accurate enough to get a good understanding of where time is spent. See merge request !4754
| * | Track method call times/counts as a single metricYorick Peterse2016-06-173-22/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'sidekiq-api-metrics' into 'master' Achilleas Pipinellis2016-06-172-0/+91
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added API endpoint for Sidekiq Metrics. ## What does this MR do? It adds an API endpoint to gather metrics about Sidekiq, it's jobs, queues, and processes. ## Why was this MR needed? There was no API endpoint for Sidekiq information. ## What are the relevant issue numbers? Fixes #7171 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !4653
| * | Added missing mount point for Sidekiq Metrics API, after it got lost on rebase.Patricio Cano2016-06-171-0/+1
| | |
| * | Fixed Rubocop errorPatricio Cano2016-06-171-0/+90
| | |
* | | Merge branch 'registry-500-fix' into 'master' Rémy Coutable2016-06-171-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Use response_bodyKamil Trzcinski2016-06-171-6/+7
| | | |
| * | | Fix regression introduced by ↵registry-500-fixKamil Trzcinski2016-06-171-3/+7
| | |/ | |/| | | | | | | | | | | | | 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-1/+5
|\ \ \ | | | | | | | | | | | | | | | | Filter out sensitive parameters of metrics data See merge request !4748
| * | | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-171-1/+5
| | |/ | |/|
* | | Merge branch 'update-column-in-batches-where' into 'master' Robert Speicher2016-06-171-52/+67
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix update_column_in_batches to update all rowsYorick Peterse2016-06-171-23/+27
| | | | | | | | | | | | | | | | | | | | | This changes update_column_in_batches to ensure it always updates all rows now. These changes also allow for an extra SELECT query to be removed, nor does it use the row count for determining offsets and the likes; instead it's only used to determine the batch size.
| * | Don't update columns in batches in a transactionYorick Peterse2016-06-151-4/+2
| | | | | | | | | | | | | | | | | | | | | 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-41/+54
| | | | | | | | | | | | | | | | | | 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-1725-5/+1044
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | a few changes based on MR feedbackJames Lopez2016-06-171-1/+1
| | | |
| * | | fixed merge conflicts on UI branchJames Lopez2016-06-1632-118/+493
| |\ \ \
| | * \ \ fixed merge conflictsJames Lopez2016-06-1632-118/+493
| | |\ \ \
| | | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵feature/project-exportJames Lopez2016-06-1632-118/+493
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/project-export # Conflicts: # app/models/ci/pipeline.rb
| | | * | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1631-490/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
| | | * | | | squashed merge and fixed conflictsJames Lopez2016-06-1631-110/+490
| | | | | | |
| * | | | | | fix wiki stuffJames Lopez2016-06-161-2/+1
| | | | | | |
| * | | | | | fix specsJames Lopez2016-06-161-1/+1
| | | | | | |
| * | | | | | lots of refactoring again based on feedback. Changed the UI slightly and ↵James Lopez2016-06-153-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed a small bug
| * | | | | | yay finally importing working with the new services structureJames Lopez2016-06-141-2/+2
| | | | | | |
| * | | | | | few fixes after refactoring the whole UI stuffJames Lopez2016-06-143-6/+4
| | | | | | |
| * | | | | | adapted current services stuff to use new project import, plus fixes a few ↵James Lopez2016-06-144-33/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | issues, updated routes, etc...
| * | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-06-141-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | fix merge issueJames Lopez2016-06-141-1/+1
| | | | | | |
| * | | | | | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-142-23/+21
| | | | | | |
| * | | | | | new export stuff and viewJames Lopez2016-06-141-1/+1
| | | | | | |
| * | | | | | lots of refactoring to reuse import serviceJames Lopez2016-06-147-161/+109
| | | | | | |
| * | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-06-146-9/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
| | * | | | | updated relation_factory based on MR feedbackJames Lopez2016-06-141-3/+3
| | | | | | |
| | * | | | | fix mergeJames Lopez2016-06-141-1/+1
| | | | | | |
| | * | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵James Lopez2016-06-144-5/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import
| | | * | | | missed line breakJames Lopez2016-06-141-0/+1
| | | | | | |
| | | * | | | few changes based on MR feedbackJames Lopez2016-06-132-2/+2
| | | | | | |