summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'zj-gitaly-read-write-check' into 'master'Nick Thomas2018-06-273-179/+22
|\ | | | | | | | | | | | | Gitaly metrics check for read/writeability Closes gitaly#1218 See merge request gitlab-org/gitlab-ce!20022
| * Gitaly metrics check for read/writeabilityZeger-Jan van de Weg2018-06-273-179/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, health checks checked for writeability of the NFS shards. Given we're moving away from that, this patch extends the checks for Gitaly to check for read and writeability. Potentially some dashboards will break, as over time these metrics will no longer appear as Prometheus doesn't get the data anymore. Observability in the circuit breaker will be reduced, but its not expected to be turned on and the circuit breaker is being removed soon too. Closes https://gitlab.com/gitlab-org/gitaly/issues/1218
* | Merge branch 'gitaly-tree-entry-dot-dot' into 'master'Sean McGivern2018-06-272-29/+19
|\ \ | |/ |/| | | | | Client-side fix for Gitaly TreeEntry bug See merge request gitlab-org/gitlab-ce!20176
| * Client-side fix for Gitaly TreeEntry buggitaly-tree-entry-dot-dotJacob Vosmaer2018-06-262-29/+19
| |
* | Merge branch 'ce-update-branch-client-preparation' into 'master'Robert Speicher2018-06-261-2/+5
|\ \ | | | | | | | | | | | | Move git calls for `Repository#update_branch` inside Gitlab::Git See merge request gitlab-org/gitlab-ce!20168
| * | Move git calls for `Repository#update_branch` inside Gitlab::Gitce-update-branch-client-preparationAlejandro Rodríguez2018-06-251-2/+5
| |/ | | | | | | This prepares this code for migration to Gitaly.
* | Merge branch 'dm-branch-api-can-push-fix' into 'master'Robert Speicher2018-06-261-3/+5
|\ \ | | | | | | | | | | | | Fix branch API can_push attribute and add specs See merge request gitlab-org/gitlab-ce!20156
| * | Fix branch API can_push attribute and add specsdm-branch-api-can-push-fixDouwe Maan2018-06-251-3/+5
| | |
* | | Merge branch 'add-rename-column-background-helper' into 'master'Yorick Peterse2018-06-264-44/+161
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a helper to rename a column using a background migration Closes #47591 See merge request gitlab-org/gitlab-ce!20180
| * | | Add a helper to rename a column using a background migrationSean McGivern2018-06-264-44/+161
| | |/ | |/| | | | | | | | | | | | | | | | | | | This works the same way as change_column_type_using_background_migration, but for renaming a column. It takes a table, not a relation, to match its concurrent counterpart. Also, generalise the cleanup migrations to reduce code duplication.
* | | Merge branch 'gitaly-backup-opt-out' into 'master'Douwe Maan2018-06-261-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Move repo backup RPC's to opt-out See merge request gitlab-org/gitlab-ce!20151
| * | | Move repo backup RPC's to opt-outgitaly-backup-opt-outJacob Vosmaer2018-06-251-4/+4
| | | |
* | | | Merge branch '48269-wiki-page-returns-error-code-502' into 'master'Douwe Maan2018-06-261-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki page returns error code 502" Closes #48269 See merge request gitlab-org/gitlab-ce!20174
| * | | | Fix performance bottleneck when rendering large wiki pagesSean McGivern2018-06-261-2/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | `Nokogiri::XML::Node#ancestors` appears to be much slower than `HTML::Pipeline::Filter#has_ancestor?` for these purposes. We already use `#has_ancestor?` elsewhere, so this change also makes this filter more consistent with other banzai filters.
* | | | Rails5 fix arel from in mysql_median_datetime_sqlJasper Maes2018-06-261-1/+7
|/ / /
* | | Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-252-2/+3
|\ \ \
| * \ \ Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'Alessio Caiazza2018-06-251-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [master] Fix xss for Markdown elements where [[_TOC_]] is enabled See merge request gitlab/gitlabhq!2400
| | * | | Fix xss for Markdown elements where [[_TOC_]] is enabledMark Chao2018-06-161-1/+1
| | | | |
| * | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-251-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399
| | * \ \ \ Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-187-156/+39
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile.rails5.lock
| | * | | | | Whitelist text-align property for th and tdDouwe Maan2018-06-181-1/+2
| | | | | | |
* | | | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-254-0/+27
| | | | | | |
* | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-251-10/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves CreateFromBundle RPC to mandatory Closes gitaly#944 See merge request gitlab-org/gitlab-ce!20144
| * | | | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-251-10/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This specific one isn't used on most machines, therefor low risk. Closes https://gitlab.com/gitlab-org/gitaly/issues/944
* | | | | | | Merge branch 'zj-is-anchestor' into 'master'Douwe Maan2018-06-252-91/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ancestor check is Gitaly only now Closes gitaly#789 and gitaly#308 See merge request gitlab-org/gitlab-ce!20095
| * | | | | | | Update remote happens through Gitaly onlyZeger-Jan van de Weg2018-06-251-75/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes closes another migration! And remotes tests around it, mostly due to stubbing this was needed. Also, these are tested on the Gitaly side too: - https://gitlab.com/gitlab-org/gitaly/issues/791 - https://gitlab.com/gitlab-org/gitaly/blob/6dd74543f6af8ebcf22aa10e39da004f388fdda5/internal/service/repository/fetch_remote_test.go Closes https://gitlab.com/gitlab-org/gitaly/issues/789
| * | | | | | | Anchestor check is Gitaly only nowZeger-Jan van de Weg2018-06-251-16/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/308
* | | | | | | Merge branch 'zj-write-config' into 'master'Douwe Maan2018-06-251-9/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write Config is mandatory Closes gitaly#879 See merge request gitlab-org/gitlab-ce!20146
| * | | | | | | Write Config is mandatoryZeger-Jan van de Weg2018-06-251-9/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/879
* | | | | | | Merge branch 'zj-missing-part-linguist' into 'master'Douwe Maan2018-06-251-23/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Languages feature gate See merge request gitlab-org/gitlab-ce!20128
| * | | | | | | Remove feature gatezj-missing-part-linguistZeger-Jan van de Weg2018-06-251-23/+2
| |/ / / / / /
* | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master'Douwe Maan2018-06-251-87/+26
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly tree entry is mandatory Closes gitaly#310 See merge request gitlab-org/gitlab-ce!20099
| * | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatoryZeger-Jan van de Weg2018-06-251-87/+26
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/310
* | | | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-251-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce setting string as value of the CI/CD variable Closes #48210 See merge request gitlab-org/gitlab-ce!20061
| * | | | | | Enforce setting string as value of the CI/CD variableTomasz Maczukin2018-06-251-0/+3
| | | | | | |
* | | | | | | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'Yorick Peterse2018-06-251-0/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix MysqlDateTimeWithTimeZone in rails 5 Closes #46275 See merge request gitlab-org/gitlab-ce!19613
| * | | | | | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-211-0/+18
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `MysqlDateTimeWithTimeZone` inherits from `ActiveRecord::Type::DateTime` (`MysqlDateTime` is not present in Rails 5) * explicitly set `NULL` default value for `merge_request_diff_files`'s `diff` column (otherwise empty string is used in a migration) and empty string is not allowed for text/blob fields in Mysql * disable NO_ZERO_DATE mode for all Mysql DB connections, otherwise SQL queries fail on inserting `0` value for `created_at` column
* | | | | | Merge branch 'zj-commit-raw-diffs' into 'master'Douwe Maan2018-06-221-7/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raw diffs are served from Gitaly Closes gitaly#222 See merge request gitlab-org/gitlab-ce!20091
| * | | | | | Raw diffs are served from Gitalyzj-commit-raw-diffsZeger-Jan van de Weg2018-06-221-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/222
* | | | | | | Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master'Robert Speicher2018-06-221-12/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rb See merge request gitlab-org/gitlab-ce!20047
| * | | | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parityRobert Speicher2018-06-201-12/+13
| | | | | | | |
* | | | | | | | Merge branch 'zj-find-ref-name' into 'master'Douwe Maan2018-06-221-11/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindRefName RPC now mandatory Closes gitaly#221 See merge request gitlab-org/gitlab-ce!20090
| * | | | | | | | FindRefName RPC now mandatoryzj-find-ref-nameZeger-Jan van de Weg2018-06-221-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has never been in OPT_OUT, dispite being ages old. The time where feature flags are still set by env vars. Closes https://gitlab.com/gitlab-org/gitaly/issues/221
* | | | | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master'Yorick Peterse2018-06-221-12/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ruby sampler metrics See merge request gitlab-org/gitlab-ce!20039
| * | | | | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gcBen Kochie2018-06-221-12/+14
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use a simple counter for sampler duration instead of a histogram. * Use a counter to collect GC time. * Remove unused objects metric. * Cleanup metric names to match Prometheus conventions. * Prefix generic GC stats with `gc_stat`. * Include worker label on memory and file descriptor metrics.
* | | | | | | | | Merge branch 'zj-repository-size' into 'master'Douwe Maan2018-06-221-15/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository size is Gitaly only Closes gitaly#393 See merge request gitlab-org/gitlab-ce!20089
| * | | | | | | | | Repository size is Gitaly onlyzj-repository-sizeZeger-Jan van de Weg2018-06-221-15/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/393
* | | | | | | | | Merge branch 'docs-request-cache' into 'master'Sean McGivern2018-06-221-36/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for RequestCache Closes #48094 See merge request gitlab-org/gitlab-ce!20064
| * | | | | | | | Add docs for RequestCache, moved from commentsLin Jen-Shin2018-06-221-36/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Git ls files is Gitaly only nowZeger-Jan van de Weg2018-06-221-34/+1
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved to the front on the line through: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitaly/issues/327
View Lorry Controller Status