Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump fog-google to 1.7.1 and google-api-client to 0.23.0sh-bump-fog-google | Stan Hu | 2018-08-21 | 1 | -6/+6 |
| | | | | | | | This is needed to support query parameters in `Fog::Storage::Google`. See https://github.com/fog/fog-google/pull/409. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957 | ||||
* | Remove Gemnasium service | Gilbert Roulot | 2018-08-20 | 1 | -3/+0 |
| | |||||
* | Fix merge requests not showing any diff files for big patches49907-commits-and-merge-requests-does-not-list-all-files-when-one-file-exceeds-size-limits | Alejandro Rodríguez | 2018-08-17 | 1 | -2/+2 |
| | |||||
* | Update Rouge to 3.2.1. Includes a critical fix for the Perl Lexer | Drew Blessing | 2018-08-16 | 1 | -1/+1 |
| | |||||
* | Fix `bin/secpick` rainbow gem error, and security branch prefixing | Michael Kozono | 2018-08-15 | 1 | -3/+2 |
| | |||||
* | Bump rugged to 0.27.4 for security fixes | Stan Hu | 2018-08-13 | 1 | -1/+1 |
| | | | | See https://github.com/libgit2/libgit2/releases for more details. | ||||
* | Bump pry to 0.11.3; pry-byebug to 3.4.3 | Robert Speicher | 2018-08-09 | 1 | -9/+7 |
| | |||||
* | Backport some changes from gitlab-org/gitlab-ee!6767 | Rubén Dávila | 2018-08-07 | 1 | -2/+2 |
| | |||||
* | Update Rouge to 3.2.0 | Drew Blessing | 2018-08-02 | 1 | -1/+1 |
| | |||||
* | Bump prometheus-client-mmap to 0.9.4 | Stan Hu | 2018-07-28 | 1 | -2/+2 |
| | | | | | | | Fixes failing builds with gcc on Archlinux and Ruby 2.4.4. See https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/26 for more details. | ||||
* | Merge branch 'sh-bump-haml-5.0.4' into 'master' | Rémy Coutable | 2018-07-26 | 1 | -1/+2 |
|\ | | | | | | | | | Bump haml gem to 5.0.4 See merge request gitlab-org/gitlab-ce!20847 | ||||
| * | Bump haml gem to 5.0.4 | Stan Hu | 2018-07-25 | 1 | -1/+2 |
| | | | | | | | | | | | | As pointed out in #49625, this version is needed to support Ruby 2.5. See https://github.com/haml/haml/blob/master/CHANGELOG.md for more details. | ||||
* | | Merge branch 'sh-include-rbtrace' into 'master' | Douwe Maan | 2018-07-25 | 1 | -0/+6 |
|\ \ | |/ |/| | | | | | Add rbtrace to Gemfile See merge request gitlab-org/gitlab-ce!20831 | ||||
| * | Add rbtrace to Gemfilesh-include-rbtrace | Stan Hu | 2018-07-25 | 1 | -0/+6 |
| | | | | | | | | | | | | | | This will be enabled if ENABLE_RBTRACE environment variable is defined. This will allow us to debug all sorts of issues in production: https://github.com/tmm1/rbtrace | ||||
* | | Merge branch 'sh-bump-html-pipeline-2.8.4' into 'master' | Rémy Coutable | 2018-07-25 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Bump html-pipeline to 2.8.4 See merge request gitlab-org/gitlab-ce!20828 | ||||
| * | | Bump html-pipeline to 2.8.4sh-bump-html-pipeline-2.8.4 | Stan Hu | 2018-07-24 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | | | In 2.8.3, it was possible to modify a constant without knowing it, which led to a major performance regression (https://gitlab.com/gitlab-org/gitlab-ce/issues/49409). Now attempting to modify the HTML::Pipeline::SanitizationFilter.WHITELIST will result in "can't modify frozen Hash". See https://github.com/jch/html-pipeline/pull/299. | ||||
* | | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitaly | Stan Hu | 2018-07-24 | 1 | -2/+2 |
|/ | | | | | | | | Without this parameter, every load of a Wiki page will load all the Wiki pages in the repository for the sidebar. This is a significant performance penalty that can significant slow the display of all Wiki pages. Relates to #40101 | ||||
* | Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performancesh-bump-sanitize-4.6.6 | Stan Hu | 2018-07-23 | 1 | -3/+3 |
| | | | | | | sanitize 4.6.6 has this optimization that will benefit Markdown rendering: https://github.com/rgrove/sanitize/pull/183 nokogiri 1.4.4 has this memory leak fix: https://github.com/sparklemotion/nokogiri/pull/1771 | ||||
* | Merge branch 'hangouts_chat_integration' into 'master' | Sean McGivern | 2018-07-23 | 1 | -0/+2 |
|\ | | | | | | | | | Hangouts chat integration See merge request gitlab-org/gitlab-ce!20290 | ||||
| * | Add Hangouts Chat service implementation | Kukovskii Vladimir | 2018-07-14 | 1 | -0/+2 |
| | | |||||
* | | Add bootsnap to development/test bundle and enable it if available | Gabriel Mazetto | 2018-07-20 | 1 | -0/+4 |
| | | | | | | | | This will enable bootsnap whenver the gem is available. | ||||
* | | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branches | Alejandro Rodríguez | 2018-07-18 | 1 | -2/+2 |
|/ | |||||
* | Upgrade grape-path-helpers to 1.0.6 | Winnie Hellmann | 2018-07-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'update-rubocop' | Sean McGivern | 2018-07-09 | 1 | -7/+7 |
|\ | |||||
| * | Use latest gitlab-styles | Lin Jen-Shin | 2018-07-09 | 1 | -2/+2 |
| | | |||||
| * | Use stable gitlab-styles and eliminate offenses | Lin Jen-Shin | 2018-07-09 | 1 | -11/+5 |
| | | |||||
| * | Update rubocop to get rid of a warning in other MR | Lin Jen-Shin | 2018-07-09 | 1 | -8/+14 |
| | | |||||
* | | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045 | Matthew Dawson | 2018-07-08 | 1 | -5/+5 |
|/ | | | | | Also update the hook logs to escape the contents properly, as the :plain filter does not do html escaping. | ||||
* | Add Repository#set_config and #delete_config | Jacob Vosmaer | 2018-07-06 | 1 | -2/+2 |
| | |||||
* | Update OmniAuth Shibboleth gem to latest to gain support | Tom Downes | 2018-07-04 | 1 | -2/+2 |
| | | | | | | for handling multi-valued SAML assertions. Add documentation of label argument for omniauth provider to override text in login button. | ||||
* | Merge branch 'bump-carrierwave-to-1-2-3' into 'master' | Kamil Trzciński (OoO till 3th) | 2018-07-04 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Bump Carrierwave gem to 1.2.3 (which contains the monkey patch for memory consumption) Closes #46182 See merge request gitlab-org/gitlab-ce!20287 | ||||
| * | Bump carrierwave gem version to 1.2.3 | Shinya Maeda | 2018-07-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'pravi/gitlab-ce-update-html-pipeline' into 'master' | Douwe Maan | 2018-07-04 | 1 | -2/+2 |
|\ \ | |/ |/| | | | | | | | | | update html-pipeline 2.7.1 -> 2.8 Closes #48571 See merge request gitlab-org/gitlab-ce!20348 | ||||
| * | update html-pipeline 2.7.1 -> 2.8 | Pirate Praveen | 2018-06-30 | 1 | -2/+2 |
| | | |||||
* | | update to support latest bcrypt. resolves #48149 | Muhammad Nuzaihan | 2018-07-01 | 1 | -1/+1 |
|/ | |||||
* | Don't hash user ID in OIDC subject claim | Markus Koller | 2018-06-28 | 1 | -8/+4 |
| | |||||
* | Gitaly metrics check for read/writeability | Zeger-Jan van de Weg | 2018-06-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | 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 remote-tracking branch 'dev/master' | Alessio Caiazza | 2018-06-25 | 1 | -4/+8 |
|\ | |||||
| * | Merge branch 'security-fj-bumping-sanitize-gem' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -4/+8 |
| |\ | | | | | | | | | | | | | [master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399 | ||||
| | * | Update gitlab-gollum-lib to 4.2.7.5 and sanitize to 4.6.5 | Francisco Javier López | 2018-06-15 | 1 | -4/+8 |
| | | | |||||
* | | | Bump sprockets to 3.7.2 to address CVE-2018-3760 | Robert Speicher | 2018-06-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'remove-allocations-gem' into 'master' | Stan Hu | 2018-06-20 | 1 | -2/+0 |
|\ \ | | | | | | | | | | | | | Remove remaining traces of the Allocations Gem See merge request gitlab-org/gitlab-ce!20029 | ||||
| * | | Remove remaining traces of the Allocations Gemremove-allocations-gem | Yorick Peterse | 2018-06-20 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we removed use of the data produced by the Allocations Gem. However, we never removed the code that just enables tracking of allocations. In this commit we remove all remaining traces of this Gem. | ||||
* | | | Merge branch 'sh-bump-rugged-0.27.2' into 'master' | Rémy Coutable | 2018-06-20 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | Bump rugged to 0.27.2 See merge request gitlab-org/gitlab-ce!20026 | ||||
| * | | Bump rugged to 0.27.2sh-bump-rugged-0.27.2 | Stan Hu | 2018-06-20 | 1 | -1/+1 |
| |/ | | | | | | | Release notes: https://github.com/libgit2/libgit2/releases/tag/v0.27.2 | ||||
* | | Migrate repo backup to gitaly | Ahmad Hassan | 2018-06-15 | 1 | -2/+2 |
|/ | |||||
* | Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter | Francisco Javier López | 2018-06-12 | 1 | -2/+2 |
| | |||||
* | Merge branch 'rs-update-rspec' into 'master' | Rémy Coutable | 2018-06-11 | 1 | -17/+17 |
|\ | | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449 | ||||
| * | Update rspec to 3.7 | Robert Speicher | 2018-06-07 | 1 | -17/+17 |
| | | |||||
* | | Merge branch 'upgrade-gitlab-markup' into 'master' | Douwe Maan | 2018-06-11 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Upgrade gitlab-markup to fix render issue with reStructuredText See merge request gitlab-org/gitlab-ce!19596 |