summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Use feature flag instead of application settigns to control if method calls ↵pawel/update_prometheus_gem_to_well_tested_versionPawel Chojnacki2017-11-232-6/+3
| | | | should be instrumented
* Use only real duration to measure method call performance via PrometheusPawel Chojnacki2017-11-231-21/+6
|
* check method timing threshold when observing method performancePawel Chojnacki2017-11-231-2/+2
|
* Reenable prometheus metricsPawel Chojnacki2017-11-231-3/+3
|
* Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-232-2/+11
|
* Merge branch '32620-speed-up-unicorn-specs' into 'master'Rémy Coutable2017-11-222-2/+1
|\ | | | | | | | | | | | | Speed up Unicorn specs by using a dummy Rack application instead of GitLab Closes #32620 See merge request gitlab-org/gitlab-ce!15548
| * Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-222-2/+1
| |
* | Merge branch 'pawel/disable_prometheus_metrics' into 'master'Stan Hu2017-11-221-3/+3
|\ \ | |/ |/| | | | | Temporarily force disable prometheus metrics See merge request gitlab-org/gitlab-ce!15549
| * Force disable Prometheus metricsPawel Chojnacki2017-11-221-3/+3
| | | | | | | | | | Until https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/11 is ready, Prometheus metrics will not work and cause issues such as #40457.
* | Merge branch '40354-improve-ee_compat_check' into 'master'Sean McGivern2017-11-221-31/+38
|\ \ | | | | | | | | | | | | Try to find the merge-base against the canonical master and name the remotes See merge request gitlab-org/gitlab-ce!15495
| * | Try to find the merge-base against the canonical masterRémy Coutable2017-11-221-31/+38
| | | | | | | | | | | | | | | | | | Also, name the remotes in Gitlab::EeCompatCheck Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '39720-group-milestone-sorting' into 'master'Sean McGivern2017-11-221-0/+40
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add Group Milestone sorting Closes #39720 See merge request gitlab-org/gitlab-ce!15230
| * | Add group milestone to feature spec and minor changesGeorge Andrinopoulos2017-11-071-7/+7
| | |
| * | Add Group Milestone sortingGeorge Andrinopoulos2017-11-071-0/+40
| | |
* | | Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-225-32/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support of Mermaid Closes #3711 See merge request gitlab-org/gitlab-ce!15107
| * | | Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-225-32/+42
| | | |
* | | | Add FetchSourceBranch Gitaly callJacob Vosmaer (GitLab)2017-11-224-8/+45
| | | |
* | | | ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`Brett Walker2017-11-211-1/+4
| | | |
* | | | Merge branch '39977-gitlab-shell-default-timeout' into 'master'Douwe Maan2017-11-211-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the default gitlab-shell timeout to 3 hours Closes #39977 See merge request gitlab-org/gitlab-ce!15292
| * | | | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-211-2/+1
| | |_|/ | |/| |
* | | | Use `make install` for Gitaly setups in non-test environmentsAlejandro Rodríguez2017-11-211-3/+8
|/ / /
* | | Merge branch 'sh-optimize-read-only-check' into 'master'Douwe Maan2017-11-211-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Optimize read-only middleware so that it does not consume as much CPU Closes #40185 and gitlab-com/infrastructure#3240 See merge request gitlab-org/gitlab-ce!15504
| * | | Revert "check for `read_only?` first before seeing if request is disallowed"digitalMoksha2017-11-211-1/+1
| | | | | | | | | | | | | | | | This reverts commit 91075c8237307e09c2be8a88ffb3711fd62417d1.
| * | | check for `read_only?` first before seeing if request is disallowedsh-optimize-read-only-checkdigitalMoksha2017-11-211-1/+1
| | | |
| * | | use `Gitlab::Routing.url_helpers` instead of ↵digitalMoksha2017-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `Rails.application.routes.url_helpers` since `Rails.application.routes.url_helpers` creates a new anonymous module every time it's called
| * | | Optimize read-only middleware so that it does not consume as much CPUStan Hu2017-11-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In !15082, we changed the behavior of the middleware to call `Rails.application.routes.recognize_path` whenever a new route arrived. However, this can be a CPU-intensive task because Rails needs to allocate memory and compile 850+ different regular expressions, which are complicated in GitLab. As a short-term fix, we can do a lightweight string match before we do the heavier comparison. Closes #40185, gitlab-com/infrastructure#3240
* | | | Skip confirmation user apiDaniel Juarez2017-11-211-1/+2
| | | |
* | | | Merge branch ↵Sean McGivern2017-11-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master' Resolve "Notes API for issues no longer returns label additions/removals" Closes #39461 See merge request gitlab-org/gitlab-ce!15080
| * | | | add `#with_metadata` scope to remove a N+1 from the notes' APImicael.bergeron2017-11-211-2/+2
| | | | |
* | | | | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-214-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After installing a new gem, batch-loader, a construct can be used to queue data to be fetched in bulk. The gem was also introduced in both gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs are not merged yet. For the generation of diffs, both the old blob and the new blob need to be loaded. This for every file in the diff, too. Now we collect all these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed, which I expect to be valid, but this needs to be confirmed by a full CI run. Possibly closes: - https://gitlab.com/gitlab-org/gitlab-ce/issues/37445 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37599 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
* | | | | Fix slow gitaly dev test bundleJacob Vosmaer (GitLab)2017-11-211-3/+1
| | | | |
* | | | | Memoize GitlabShellAdapter for performance and ease of testingStan Hu2017-11-201-1/+1
| |/ / / |/| | | | | | | | | | | Port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3463#note_47990536
* | | | Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'Nick Thomas2017-11-201-47/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the rake task `gitlab:sidekiq:drop_post_receive` Closes #40290 See merge request gitlab-org/gitlab-ce!15493
| * | | | remove the rake task `gitlab:sidekiq:drop_post_receive`digitalMoksha2017-11-201-47/+0
| | | | | | | | | | | | | | | | | | | | This task is no longer being used and is not documented.
* | | | | Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bitbucket wiki import with hashed storage enabled Closes #40292 See merge request gitlab-org/gitlab-ce!15490
| * | | | | Fix bitbucket wiki import with hashed storage enabledNick Thomas2017-11-201-2/+2
| |/ / / /
* | | | | Clarify wording of protected branch settings for the default branchSean McGivern2017-11-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | No-one is allowed to force push to a protected branch, or delete it. That's correct in the documentation, but was wrong in the drop-down.
* | | | | Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-202-1/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RefService.DeleteRefs RPC Closes gitaly#740 See merge request gitlab-org/gitlab-ce!15460
| * | | | Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-172-1/+16
| | | | |
* | | | | Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-202-3/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't move project repository/attachments when using hashed storage Closes #40289 See merge request gitlab-org/gitlab-ce!15479
| * | | | | Don't move project repository/attachments when using hashed storageBob Van Landuyt2017-11-202-3/+17
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is using hashed storage, the repositories and attachments wouldn't be saved on disk using the `full_path`. So the migration would not do anything. However: best to just skip moving when hashed storage is enabled.
* | | | | Clean up schema of the "merge_requests" tableYorick Peterse2017-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds various foreign keys and indexes to the "merge_requests" table as outlined in https://gitlab.com/gitlab-org/gitlab-ce/issues/31825. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31825
* | | | | Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan2017-11-201-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463
| * | | | | Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts used to take a `Repository` and pass that to `Gitlab::Highlight.highlight`, which would call `#gitattribute` on the repository. Now they use a `Gitlab::Git::Repository`, which didn't have that method defined - but defining it on `Gitlab::Git::Repository` does make it available on `Repository` through `method_missing`, so we can do that and both cases will work.
* | | | | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-2053-0/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
| * | | | | | Adds Rubocop rule for line break after guard clauseJacopo2017-11-1653-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* | | | | | | Fix Gitlab::Git::Repository#remote_tags using unexisting variableAlejandro Rodríguez2017-11-201-2/+2
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'restrict-update-column-in-batches-for-large-tables' into 'master'Robert Speicher2017-11-171-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict update column in batches for large tables See merge request gitlab-org/gitlab-ce!15458
| * | | | | | Add computed update docs for update_column_in_batchesSean McGivern2017-11-171-0/+9
| | | | | | |
* | | | | | | Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan2017-11-171-1/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the selects when counting the last page Closes #40266 See merge request gitlab-org/gitlab-ce!15456
View Lorry Controller Status